chrome/browser/ui/sync/profile_signin_confirmation_helper.cc - Issue 515563003: Remove dependency of chrome in WebRequestPermissions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

Issue 515563003: Remove dependency of chrome in WebRequestPermissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move KWebStoreAppId to extensions. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/sync/test/integration/two_client_apps_sync_test.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

index 16fd457b6d8c9c7ff2ccd2965f3b42d0fcde7ac3..2ba3184b47e68d0fa916c19115d67f3fd2ac8f5f 100644

--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

@@ -26,6 +26,7 @@

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/sync_helper.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

#endif

@@ -207,7 +208,7 @@ bool HasSyncedExtensions(Profile* profile) {

// page, but since it's installed by default we don't want to

// consider it when determining if the profile is dirty.

if (extensions::sync_helper::IsSyncable(iter->get()) &&

- (*iter)->id() != extension_misc::kWebStoreAppId &&

+ (*iter)->id() != extensions::kWebStoreAppId &&

(*iter)->id() != extension_misc::kChromeAppId) {

DVLOG(1) << "ProfileSigninConfirmationHelper: "

<< "profile contains a synced extension: " << (*iter)->id();