chrome/browser/ui/app_list/app_list_controller_delegate_impl.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_controller_delegate_impl.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/sync/test/integration/two_client_apps_sync_test.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c14af7f0c7a918a823e08a8c5a90b8d983b07bbf..3373b4cc6be9b39197b39e81efb97c7e6a07bb1e 100644

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

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

@@ -13,6 +13,7 @@

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

#include "extensions/browser/extension_system.h"

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

#include "extensions/common/extension.h"

#include "net/base/url_util.h"

#include "ui/gfx/image/image_skia.h"

@@ -103,7 +104,7 @@ void AppListControllerDelegateImpl::LaunchApp(

AppLaunchParams params(profile, extension, NEW_FOREGROUND_TAB);

if (source != LAUNCH_FROM_UNKNOWN &&

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

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

// Set an override URL to include the source.

GURL extension_url = extensions::AppLaunchInfo::GetFullLaunchURL(extension);

params.override_url = net::AppendQueryParameter(