| 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 473b4140afc364d8082896cbafce875b9c030163..1d4991ca0b09ed6a36141107807de8cc392831e0 100644
|
| --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
| +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
|
| @@ -161,14 +161,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);
|
| @@ -182,7 +182,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);
|
| @@ -507,7 +507,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());
|
|
|