chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/ash/launcher/chrome_launcher_controller.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/extension_app_model_builder_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

index a3690c2691e84f4730176281f61add080203ac4c..40b62086503f1adaeaca61a850869bd518f7db68 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

@@ -74,6 +74,7 @@

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/extension_util.h"

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

#include "extensions/common/extension.h"

#include "extensions/common/extension_resource.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

@@ -737,7 +738,7 @@ void ChromeLauncherController::LaunchApp(const std::string& app_id,

event_flags,

chrome::HOST_DESKTOP_TYPE_ASH);

if (source != ash::LAUNCH_FROM_UNKNOWN &&

- app_id == extension_misc::kWebStoreAppId) {

+ app_id == extensions::kWebStoreAppId) {

// Get the corresponding source string.

std::string source_value = GetSourceFromAppListSource(source);