[AUTO] Patches auto-rebase for master branch (#2538)
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
@@ -212,7 +212,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
|
||||
const BookmarkNode* reading_list_node =
|
||||
local_or_syncable_reading_list_manager_->GetRoot();
|
||||
if (IsPermanentFolderVisible(
|
||||
@@ -1237,6 +1268,17 @@ void BookmarkBridge::GetBookmarksOfType(
|
||||
@@ -1232,6 +1263,17 @@ void BookmarkBridge::GetBookmarksOfType(
|
||||
AddBookmarkNodesToBookmarkIdList(env, j_list, results);
|
||||
}
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
|
||||
#include "extensions/common/manifest.h"
|
||||
#include "extensions/common/manifest_constants.h"
|
||||
#include "extensions/common/manifest_handlers/permissions_parser.h"
|
||||
@@ -229,6 +230,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
|
||||
@@ -245,6 +246,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
|
||||
// there was previously stored data, or an empty string otherwise. The Set will
|
||||
// overwrite any previous login.
|
||||
std::string GetWebstoreLogin(Profile* profile) {
|
||||
@@ -198,7 +198,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
|
||||
if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
|
||||
return profile->GetPrefs()->GetString(kWebstoreLogin);
|
||||
}
|
||||
@@ -236,11 +239,15 @@ std::string GetWebstoreLogin(Profile* profile) {
|
||||
@@ -252,11 +255,15 @@ std::string GetWebstoreLogin(Profile* profile) {
|
||||
}
|
||||
|
||||
void SetWebstoreLogin(Profile* profile, const std::string& login) {
|
||||
@@ -214,7 +214,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
|
||||
switch (status) {
|
||||
case kCanRequest:
|
||||
return api::webstore_private::ExtensionInstallStatus::kCanRequest;
|
||||
@@ -1178,7 +1185,8 @@ ExtensionFunction::ResponseAction
|
||||
@@ -1194,7 +1201,8 @@ ExtensionFunction::ResponseAction
|
||||
WebstorePrivateIsInIncognitoModeFunction::Run() {
|
||||
Profile* profile = Profile::FromBrowserContext(browser_context());
|
||||
return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
|
||||
@@ -224,7 +224,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
|
||||
}
|
||||
|
||||
WebstorePrivateIsPendingCustodianApprovalFunction::
|
||||
@@ -1275,11 +1283,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
|
||||
@@ -1291,11 +1299,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
|
||||
request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
|
||||
recent_navigations_to_collect);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user