Lint fixes
This commit is contained in:
mkarolin
@@ -1,4 +1,5 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
/* Copyright 2020 The Brave Authors. All rights reserved.
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
@@ -40,7 +41,7 @@ class BraveSpellingMenuObserverTest : public InProcessBrowserTest {
|
||||
observer_.reset(new SpellingMenuObserver(menu_.get()));
|
||||
menu_->SetObserver(observer_.get());
|
||||
// Uncomment to print the menu to standard output for each test.
|
||||
//menu_->EnablePrintMenu();
|
||||
// menu_->EnablePrintMenu();
|
||||
}
|
||||
|
||||
void InitMenu(const char* word, const char* suggestion) {
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
|
||||
#include "brave/browser/ui/views/tabs/brave_browser_tab_strip_controller.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include "brave/browser/ui/views/tabs/brave_tab_context_menu_contents.h"
|
||||
#include "chrome/browser/ui/views/frame/browser_view.h"
|
||||
#include "chrome/browser/ui/views/tabs/tab_strip.h"
|
||||
|
||||
@@ -30,7 +30,8 @@ BraveCreatePermissionContexts(Profile* profile) {
|
||||
} // namespace
|
||||
|
||||
#define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl
|
||||
#define GeolocationPermissionContextDelegate BraveGeolocationPermissionContextDelegate
|
||||
#define GeolocationPermissionContextDelegate \
|
||||
BraveGeolocationPermissionContextDelegate
|
||||
#include "../../../../../chrome/browser/permissions/permission_manager_factory.cc"
|
||||
#undef GeolocationPermissionContextDelegate
|
||||
#undef BuildServiceInstanceFor
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
|
||||
#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
|
||||
|
||||
#define GetLastUsedProfileName virtual GetLastUsedProfileName
|
||||
#define InitProfileUserPrefs virtual InitProfileUserPrefs
|
||||
#define DoFinalInitForServices virtual DoFinalInitForServices
|
||||
@@ -21,3 +24,5 @@
|
||||
#undef DoFinalInitForServices
|
||||
#undef InitProfileUserPrefs
|
||||
#undef GetLastUsedProfileName
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
|
||||
|
||||
@@ -57,8 +57,8 @@ class FakeInstallDetails : public InstallDetails {
|
||||
TEST(InstallDetailsTest, GetClientStateKeyPath) {
|
||||
FakeInstallDetails details;
|
||||
#if defined(OFFICIAL_BUILD)
|
||||
EXPECT_THAT(details.GetClientStateKeyPath(),
|
||||
StrEq(L"Software\\BraveSoftware\\Update\\ClientState\\testguid"));
|
||||
EXPECT_THAT(details.GetClientStateKeyPath(),
|
||||
StrEq(L"Software\\BraveSoftware\\Update\\ClientState\\testguid"));
|
||||
#else
|
||||
EXPECT_THAT(details.GetClientStateKeyPath(),
|
||||
StrEq(std::wstring(L"Software\\").append(kProductPathName)));
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
/* Copyright 2020 The Brave Authors. All rights reserved.
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// Brand-specific types and constants for Google Chrome.
|
||||
|
||||
#ifndef CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
|
||||
#define CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
|
||||
#ifndef BRAVE_CHROMIUM_SRC_CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
|
||||
#define BRAVE_CHROMIUM_SRC_CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
|
||||
|
||||
namespace install_static {
|
||||
|
||||
@@ -25,4 +26,4 @@ enum InstallConstantIndex {
|
||||
|
||||
} // namespace install_static
|
||||
|
||||
#endif // CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_INSTALL_STATIC_CHROMIUM_INSTALL_MODES_H_
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
|
||||
#if defined(OFFICIAL_BUILD)
|
||||
#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -66,8 +66,8 @@
|
||||
ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
|
||||
ContentSettingsInfo::PERSISTENT, \
|
||||
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
|
||||
/* We need 62, 63, 64 for ContentSettingsTypes for Android tabs \
|
||||
* migration*/ \
|
||||
/* We need 62, 63, 64 for ContentSettingsTypes for Android tabs */ \
|
||||
/* migration*/ \
|
||||
/* We read only from these settings*/ \
|
||||
Register( \
|
||||
static_cast<ContentSettingsType>(62), "desktop-view", \
|
||||
|
||||
@@ -10,9 +10,10 @@
|
||||
#include "third_party/widevine/cdm/buildflags.h"
|
||||
|
||||
// In components/cdm/renderer/android_key_systems.h the declaration of
|
||||
// AddAndroidWidevine is guarded by ENABLE_WIDEVINE, but in content_renderer_client_impl below
|
||||
// it is used without a guard. Instead of patching we can add an empty
|
||||
// definition of the same function here for when ENABLE_WIDEVINE is not true.
|
||||
// AddAndroidWidevine is guarded by ENABLE_WIDEVINE, but in
|
||||
// content_renderer_client_impl below it is used without a guard. Instead of
|
||||
// patching we can add an empty definition of the same function here for when
|
||||
// ENABLE_WIDEVINE is not true.
|
||||
|
||||
#if !BUILDFLAG(ENABLE_WIDEVINE)
|
||||
namespace cdm {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
/* Copyright 2019 The Brave Authors. All rights reserved.
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user