chrome/browser/ui/webui/ntp/core_app_launcher_handler.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/webui/ntp/core_app_launcher_handler.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/webui/ntp/app_launcher_handler.cc ('k') | chrome/common/extensions/extension_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc

diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc

index 68e19318de08bf33bcb311dd6fa4588c548734cc..9812a3aa210cc930a5df6bb1146ae48259992902 100644

--- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc

+++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc

@@ -12,6 +12,7 @@

#include "components/pref_registry/pref_registry_syncable.h"

#include "content/public/browser/web_ui.h"

#include "extensions/browser/extension_registry.h"

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

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

#include "net/base/escape.h"

@@ -46,7 +47,7 @@ void CoreAppLauncherHandler::RecordAppListSearchLaunch(

const extensions::Extension* extension) {

extension_misc::AppLaunchBucket bucket =

extension_misc::APP_LAUNCH_APP_LIST_SEARCH;

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

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

bucket = extension_misc::APP_LAUNCH_APP_LIST_SEARCH_WEBSTORE;

else if (extension->id() == extension_misc::kChromeAppId)

bucket = extension_misc::APP_LAUNCH_APP_LIST_SEARCH_CHROME;

@@ -58,7 +59,7 @@ void CoreAppLauncherHandler::RecordAppListMainLaunch(

const extensions::Extension* extension) {

extension_misc::AppLaunchBucket bucket =

extension_misc::APP_LAUNCH_APP_LIST_MAIN;

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

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

bucket = extension_misc::APP_LAUNCH_APP_LIST_MAIN_WEBSTORE;

else if (extension->id() == extension_misc::kChromeAppId)

bucket = extension_misc::APP_LAUNCH_APP_LIST_MAIN_CHROME;