Formatting fixes.
This commit is contained in:
@@ -14,7 +14,6 @@ import org.chromium.chrome.browser.BraveConfig;
|
||||
// The purpose of this class is to hide BraveSyncWorker object under `enable_brave_sync`
|
||||
// and create it without explict import
|
||||
public class BraveSyncReflectionUtils {
|
||||
|
||||
private static Object sBraveSyncWorker;
|
||||
private static boolean sInitialized;
|
||||
private static String TAG = "SYNC";
|
||||
|
||||
@@ -214,7 +214,8 @@ public class BraveToolbarManager extends ToolbarManager {
|
||||
mTabModelSelector.getModel(mIncognitoStateProvider.isIncognitoSelected())
|
||||
.closeAllTabs();
|
||||
};
|
||||
assert (mBottomControlsCoordinatorSupplier.get() instanceof BraveBottomControlsCoordinator);
|
||||
assert (mBottomControlsCoordinatorSupplier.get()
|
||||
instanceof BraveBottomControlsCoordinator);
|
||||
((BraveBottomControlsCoordinator) mBottomControlsCoordinatorSupplier.get())
|
||||
.initializeWithNative(mActivity, mCompositorViewHolder.getResourceManager(),
|
||||
mCompositorViewHolder.getLayoutManager(), tabSwitcherClickHandler,
|
||||
|
||||
+1
-1
@@ -16,8 +16,8 @@ import org.chromium.base.supplier.ObservableSupplier;
|
||||
import org.chromium.base.supplier.OneShotCallback;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
|
||||
import org.chromium.chrome.browser.toolbar.TabCountProvider;
|
||||
import org.chromium.chrome.browser.theme.ThemeColorProvider;
|
||||
import org.chromium.chrome.browser.toolbar.TabCountProvider;
|
||||
import org.chromium.chrome.browser.toolbar.menu_button.MenuButton;
|
||||
import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper;
|
||||
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
|
||||
|
||||
+1
-1
@@ -15,9 +15,9 @@ import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.identity_disc.IdentityDiscController;
|
||||
import org.chromium.chrome.browser.layouts.LayoutStateProvider;
|
||||
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
|
||||
import org.chromium.chrome.browser.theme.ThemeColorProvider;
|
||||
import org.chromium.chrome.browser.toolbar.ButtonData;
|
||||
import org.chromium.chrome.browser.toolbar.ButtonDataProvider;
|
||||
import org.chromium.chrome.browser.theme.ThemeColorProvider;
|
||||
import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
|
||||
import org.chromium.chrome.browser.toolbar.ToolbarTabController;
|
||||
import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
|
||||
|
||||
@@ -90,22 +90,22 @@ TEST_F(BraveDownloadItemModelTest, GetOriginUrlText) {
|
||||
// Expected is_secure.
|
||||
bool expected_is_secure;
|
||||
} kTestCases[] = {
|
||||
// Not secure.
|
||||
{"http://example.com/foo.bar", "http://example.com", false},
|
||||
// Secure.
|
||||
{"https://example.com:5678/foo.bar", "https://example.com:5678", true},
|
||||
// File, secure.
|
||||
{"file:///c:/foo/bar/foo.bar", "file:///", true},
|
||||
// about:blank, secure.
|
||||
{"about:blank", "about:blank", true},
|
||||
// about:srcdoc, secure.
|
||||
{"about:srcdoc", "about:srcdoc", true},
|
||||
// Other about: URLs, not secure.
|
||||
{"about:about", "about:about", true},
|
||||
// invalid, not secure.
|
||||
{"foo.bar.baz", "", false},
|
||||
// empty, not secure.
|
||||
{"", "", false},
|
||||
// Not secure.
|
||||
{"http://example.com/foo.bar", "http://example.com", false},
|
||||
// Secure.
|
||||
{"https://example.com:5678/foo.bar", "https://example.com:5678", true},
|
||||
// File, secure.
|
||||
{"file:///c:/foo/bar/foo.bar", "file:///", true},
|
||||
// about:blank, secure.
|
||||
{"about:blank", "about:blank", true},
|
||||
// about:srcdoc, secure.
|
||||
{"about:srcdoc", "about:srcdoc", true},
|
||||
// Other about: URLs, not secure.
|
||||
{"about:about", "about:about", true},
|
||||
// invalid, not secure.
|
||||
{"foo.bar.baz", "", false},
|
||||
// empty, not secure.
|
||||
{"", "", false},
|
||||
};
|
||||
|
||||
SetupDownloadItemDefaults();
|
||||
|
||||
@@ -3,8 +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/. */
|
||||
|
||||
#include "brave/build/android/jni_headers/BraveSigninManager_jni.h"
|
||||
#include "chrome/browser/android/signin/signin_manager_android.h"
|
||||
|
||||
#include "brave/build/android/jni_headers/BraveSigninManager_jni.h"
|
||||
#include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h"
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -20,20 +20,20 @@ namespace {
|
||||
// to fall onto Chromium code.
|
||||
bool ShouldIgnoreHarmonySpec(const ui::NativeTheme& theme) {
|
||||
#if defined(OS_MAC)
|
||||
return false;
|
||||
return false;
|
||||
#else
|
||||
if (theme.UserHasContrastPreference())
|
||||
return true;
|
||||
if (theme.ShouldUseDarkColors())
|
||||
return false;
|
||||
if (theme.UserHasContrastPreference())
|
||||
return true;
|
||||
if (theme.ShouldUseDarkColors())
|
||||
return false;
|
||||
|
||||
// TODO(pbos): Revisit this check. Both GG900 and black are considered
|
||||
// "default black" as the common theme uses GG900 as primary color.
|
||||
const SkColor test_color =
|
||||
theme.GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
|
||||
const bool label_color_is_black =
|
||||
test_color == SK_ColorBLACK || test_color == gfx::kGoogleGrey900;
|
||||
return !label_color_is_black;
|
||||
// TODO(pbos): Revisit this check. Both GG900 and black are considered
|
||||
// "default black" as the common theme uses GG900 as primary color.
|
||||
const SkColor test_color =
|
||||
theme.GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
|
||||
const bool label_color_is_black =
|
||||
test_color == SK_ColorBLACK || test_color == gfx::kGoogleGrey900;
|
||||
return !label_color_is_black;
|
||||
#endif // defined(OS_MAC)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -15,8 +15,8 @@
|
||||
#include "brave/grit/brave_generated_resources.h"
|
||||
#include "chrome/browser/ui/views/chrome_layout_provider.h"
|
||||
#include "components/permissions/request_type.h"
|
||||
#include "ui/gfx/text_constants.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
#include "ui/gfx/text_constants.h"
|
||||
#include "ui/views/controls/button/checkbox.h"
|
||||
#include "ui/views/controls/label.h"
|
||||
#include "ui/views/style/typography.h"
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
* 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/. */
|
||||
|
||||
#include "brave/browser/ui/toolbar/brave_app_menu_model.h"
|
||||
#include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
|
||||
|
||||
#include "brave/browser/ui/toolbar/brave_app_menu_model.h"
|
||||
|
||||
#define AppMenuModel BraveAppMenuModel
|
||||
#include "../../../../../../../chrome/browser/ui/views/toolbar/browser_app_menu_button.cc"
|
||||
#undef AppMenuModel
|
||||
|
||||
@@ -73,9 +73,8 @@ VersionUpdaterMac::VersionUpdaterMac()
|
||||
VersionUpdaterMac::~VersionUpdaterMac() {
|
||||
}
|
||||
|
||||
void VersionUpdaterMac::CheckForUpdate(
|
||||
StatusCallback status_callback,
|
||||
PromoteCallback promote_callback) {
|
||||
void VersionUpdaterMac::CheckForUpdate(StatusCallback status_callback,
|
||||
PromoteCallback promote_callback) {
|
||||
status_callback_ = std::move(status_callback);
|
||||
|
||||
#if BUILDFLAG(ENABLE_SPARKLE)
|
||||
|
||||
@@ -5,14 +5,13 @@
|
||||
|
||||
// IsSetupInProgress isn't accurate in brave sync flow especially for the first
|
||||
// time setup, we rely on it to display setup dialog
|
||||
#define BRAVE_GET_SYNC_STATUS_DICTIONARY \
|
||||
sync_status->SetBoolean( \
|
||||
"firstSetupInProgress", \
|
||||
service && !disallowed_by_policy && \
|
||||
#define BRAVE_GET_SYNC_STATUS_DICTIONARY \
|
||||
sync_status->SetBoolean( \
|
||||
"firstSetupInProgress", \
|
||||
service && !disallowed_by_policy && \
|
||||
!service->GetUserSettings()->IsFirstSetupComplete()); \
|
||||
sync_status->SetBoolean( \
|
||||
"isEngineInitialized", \
|
||||
service && service->IsEngineInitialized());
|
||||
sync_status->SetBoolean("isEngineInitialized", \
|
||||
service && service->IsEngineInitialized());
|
||||
|
||||
#include "../../../../../../../chrome/browser/ui/webui/settings/people_handler.cc"
|
||||
#undef BRAVE_GET_SYNC_STATUS_DICTIONARY
|
||||
|
||||
@@ -23,13 +23,12 @@ std::string GetChannelName() {
|
||||
|
||||
NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
|
||||
|
||||
// Only ever return "", "unknown", "beta", "dev", or "nightly" in an official
|
||||
// build.
|
||||
// Only ever return "", "unknown", "beta", "dev", or "nightly" in an
|
||||
// official build.
|
||||
if (!channel) {
|
||||
// For the stable channel, KSChannelID is not set.
|
||||
channel = @"";
|
||||
} else if ([channel isEqual:@"beta"] ||
|
||||
[channel isEqual:@"dev"] ||
|
||||
} else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"] ||
|
||||
[channel isEqual:@"nightly"]) {
|
||||
// do nothing.
|
||||
} else {
|
||||
|
||||
@@ -191,8 +191,7 @@ const char kPaymentMethodsLearnMoreURL[] =
|
||||
const char kPrivacyLearnMoreURL[] =
|
||||
"https://support.brave.com/hc/en-us/articles/"
|
||||
"360017989132-How-do-I-change-my-Privacy-Settings-";
|
||||
const char kPrivacySandboxURL[] =
|
||||
"https://support.brave.com";
|
||||
const char kPrivacySandboxURL[] = "https://support.brave.com";
|
||||
|
||||
const char kRemoveNonCWSExtensionURL[] =
|
||||
"https://support.brave.com/hc/en-us/articles/"
|
||||
|
||||
@@ -21,8 +21,8 @@ IdentityManager::InitParameters BuildBraveIdentityManagerInitParameters(
|
||||
std::make_unique<BravePrimaryAccountMutatorImpl>(
|
||||
init_params.account_tracker_service.get(),
|
||||
init_params.token_service.get(),
|
||||
init_params.primary_account_manager.get(),
|
||||
params->pref_service, params->account_consistency);
|
||||
init_params.primary_account_manager.get(), params->pref_service,
|
||||
params->account_consistency);
|
||||
|
||||
return init_params;
|
||||
}
|
||||
|
||||
+10
-12
@@ -12,20 +12,18 @@
|
||||
#include "third_party/blink/renderer/core/frame/navigator_id.h"
|
||||
#include "third_party/blink/renderer/core/loader/frame_loader.h"
|
||||
|
||||
#define BRAVE_NAVIGATOR_BASE_USER_AGENT \
|
||||
if (!GetExecutionContext()) \
|
||||
return String(); \
|
||||
if (blink::WebContentSettingsClient* settings = \
|
||||
brave::GetContentSettingsClientFor(GetExecutionContext())) { \
|
||||
if (!settings->AllowFingerprinting(true)) { \
|
||||
return brave::BraveSessionCache::From(*(GetExecutionContext())) \
|
||||
.FarbledUserAgent(GetExecutionContext()->UserAgent()); \
|
||||
} \
|
||||
} \
|
||||
#define BRAVE_NAVIGATOR_BASE_USER_AGENT \
|
||||
if (!GetExecutionContext()) \
|
||||
return String(); \
|
||||
if (blink::WebContentSettingsClient* settings = \
|
||||
brave::GetContentSettingsClientFor(GetExecutionContext())) { \
|
||||
if (!settings->AllowFingerprinting(true)) { \
|
||||
return brave::BraveSessionCache::From(*(GetExecutionContext())) \
|
||||
.FarbledUserAgent(GetExecutionContext()->UserAgent()); \
|
||||
} \
|
||||
}
|
||||
|
||||
#include "../../../../../../../third_party/blink/renderer/core/execution_context/navigator_base.h"
|
||||
#undef BRAVE_NAVIGATOR_BASE_USER_AGENT
|
||||
|
||||
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_RENDERER_CORE_EXECUTION_CONTEXT_NAVIGATOR_BASE_H_
|
||||
|
||||
@@ -31,7 +31,7 @@ BackgroundHelperLinux::~BackgroundHelperLinux() {
|
||||
bool BackgroundHelperLinux::IsForeground() const {
|
||||
x11::Window x11_window = x11::Window::None;
|
||||
x11::GetProperty(ui::GetX11RootWindow(), x11::GetAtom("_NET_ACTIVE_WINDOW"),
|
||||
&x11_window);
|
||||
&x11_window);
|
||||
|
||||
for (auto* browser : *BrowserList::GetInstance()) {
|
||||
auto window =
|
||||
|
||||
@@ -13,11 +13,11 @@ namespace signin {
|
||||
class BravePrimaryAccountMutatorImpl : public PrimaryAccountMutatorImpl {
|
||||
public:
|
||||
BravePrimaryAccountMutatorImpl(
|
||||
AccountTrackerService* account_tracker,
|
||||
ProfileOAuth2TokenService* token_service,
|
||||
PrimaryAccountManager* primary_account_manager,
|
||||
PrefService* pref_service,
|
||||
signin::AccountConsistencyMethod account_consistency);
|
||||
AccountTrackerService* account_tracker,
|
||||
ProfileOAuth2TokenService* token_service,
|
||||
PrimaryAccountManager* primary_account_manager,
|
||||
PrefService* pref_service,
|
||||
signin::AccountConsistencyMethod account_consistency);
|
||||
~BravePrimaryAccountMutatorImpl() override;
|
||||
|
||||
#if !defined(OS_CHROMEOS)
|
||||
|
||||
@@ -177,13 +177,15 @@ void BraveBookmarksExportObserver::OnExportFinished(Result result) {
|
||||
// MARK: - Internal artificial nodes used for exporting arbitrary bookmarks to a file
|
||||
|
||||
- (std::unique_ptr<bookmarks::BookmarkNode>)getRootNode {
|
||||
return std::make_unique<bookmarks::BookmarkNode>(/*id=*/0,
|
||||
return std::make_unique<bookmarks::BookmarkNode>(
|
||||
/*id=*/0,
|
||||
base::GUID::ParseLowercase(bookmarks::BookmarkNode::kRootNodeGuid),
|
||||
GURL());
|
||||
}
|
||||
|
||||
- (std::unique_ptr<bookmarks::BookmarkNode>)getBookmarksBarNode {
|
||||
auto node = std::make_unique<bookmarks::BookmarkNode>(/*id=*/1,
|
||||
auto node = std::make_unique<bookmarks::BookmarkNode>(
|
||||
/*id=*/1,
|
||||
base::GUID::ParseLowercase(bookmarks::BookmarkNode::kBookmarkBarNodeGuid),
|
||||
GURL());
|
||||
node->SetTitle(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME));
|
||||
@@ -191,17 +193,21 @@ void BraveBookmarksExportObserver::OnExportFinished(Result result) {
|
||||
}
|
||||
|
||||
- (std::unique_ptr<bookmarks::BookmarkNode>)getOtherBookmarksNode {
|
||||
auto node = std::make_unique<bookmarks::BookmarkNode>(/*id=*/2,
|
||||
auto node = std::make_unique<bookmarks::BookmarkNode>(
|
||||
/*id=*/2,
|
||||
base::GUID::ParseLowercase(
|
||||
bookmarks::BookmarkNode::kOtherBookmarksNodeGuid), GURL());
|
||||
bookmarks::BookmarkNode::kOtherBookmarksNodeGuid),
|
||||
GURL());
|
||||
node->SetTitle(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME));
|
||||
return node;
|
||||
}
|
||||
|
||||
- (std::unique_ptr<bookmarks::BookmarkNode>)getMobileBookmarksNode {
|
||||
auto node = std::make_unique<bookmarks::BookmarkNode>(/*id=*/3,
|
||||
auto node = std::make_unique<bookmarks::BookmarkNode>(
|
||||
/*id=*/3,
|
||||
base::GUID::ParseLowercase(
|
||||
bookmarks::BookmarkNode::kMobileBookmarksNodeGuid), GURL());
|
||||
bookmarks::BookmarkNode::kMobileBookmarksNodeGuid),
|
||||
GURL());
|
||||
node->SetTitle(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME));
|
||||
return node;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user