Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4006)

Unified Diff: chrome/browser/ui/webui/ntp/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: 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
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 3edb13809f974f65f10547bc0552296398760a8e..b84f6bc42fe3121151bf8a638303f8af193612c4 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -160,14 +160,14 @@ void AppLauncherHandler::CreateAppInfo(
value->SetBoolean("is_component",
extension->location() == extensions::Manifest::COMPONENT);
value->SetBoolean("is_webstore",
- extension->id() == extension_misc::kWebStoreAppId);
+ extension->id() == extensions::kWebStoreAppId);
AppSorting* sorting = prefs->app_sorting();
syncer::StringOrdinal page_ordinal = sorting->GetPageOrdinal(extension->id());
if (!page_ordinal.IsValid()) {
// Make sure every app has a page ordinal (some predate the page ordinal).
// The webstore app should be on the first page.
- page_ordinal = extension->id() == extension_misc::kWebStoreAppId ?
+ page_ordinal = extension->id() == extensions::kWebStoreAppId ?
sorting->CreateFirstAppPageOrdinal() :
sorting->GetNaturalAppPageOrdinal();
sorting->SetPageOrdinal(extension->id(), page_ordinal);
@@ -181,7 +181,7 @@ void AppLauncherHandler::CreateAppInfo(
// Make sure every app has a launch ordinal (some predate the launch
// ordinal). The webstore's app launch ordinal is always set to the first
// position.
- app_launch_ordinal = extension->id() == extension_misc::kWebStoreAppId ?
+ app_launch_ordinal = extension->id() == extensions::kWebStoreAppId ?
sorting->CreateFirstAppLaunchOrdinal(page_ordinal) :
sorting->CreateNextAppLaunchOrdinal(page_ordinal);
sorting->SetAppLaunchOrdinal(extension->id(), app_launch_ordinal);
@@ -506,7 +506,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::ListValue* args) {
WindowOpenDisposition disposition = args->GetSize() > 3 ?
webui::GetDispositionFromClick(args, 3) : CURRENT_TAB;
- if (extension_id != extension_misc::kWebStoreAppId) {
+ if (extension_id != extensions::kWebStoreAppId) {
CHECK_NE(launch_bucket, extension_misc::APP_LAUNCH_BUCKET_INVALID);
CoreAppLauncherHandler::RecordAppLaunchType(launch_bucket,
extension->GetType());

Powered by Google App Engine
This is Rietveld 408576698