chrome/browser/ui/app_list/app_list_syncable_service.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/app_list/app_list_syncable_service.cc

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

Patch Set: Updated. Created 6 years, 3 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

« no previous file with comments | « chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc ('k') | chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_syncable_service.cc

diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc

index 69def942c83b4ae41a47527cc14684b673a3de38..4ac027b67bb83ff747ed158052de4bcda8ca5cd9 100644

--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc

+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc

@@ -20,6 +20,7 @@

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/uninstall_reason.h"

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

#include "sync/api/sync_change_processor.h"

#include "sync/api/sync_data.h"

#include "sync/api/sync_merge_result.h"

@@ -107,7 +108,7 @@ bool AppIsDefault(ExtensionService* service, const std::string& id) {

bool IsUnRemovableDefaultApp(const std::string& id) {

if (id == extension_misc::kChromeAppId ||

- id == extension_misc::kWebStoreAppId)

+ id == extensions::kWebStoreAppId)

return true;

#if defined(OS_CHROMEOS)

if (id == file_manager::kFileManagerAppId || id == genius_app::kGeniusAppId)

@@ -881,7 +882,7 @@ syncer::StringOrdinal AppListSyncableService::GetOemFolderPos() {

size_t oem_index = 0;

for (; oem_index < item_list->item_count() - 1; ++oem_index) {

AppListItem* cur_item = item_list->item_at(oem_index);

- if (cur_item->id() == extension_misc::kWebStoreAppId)

+ if (cur_item->id() == extensions::kWebStoreAppId)

break;

}

syncer::StringOrdinal oem_ordinal;