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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Issue 14241002: Move the parsing of app.launch related keys out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 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 e6856f9a2c730446a26edb7e90f657b72aa5cd00..bae2f348661f640ec7d6dec1b0740bd326821479 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launcher_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -98,7 +99,8 @@ void AppLauncherHandler::CreateAppInfo(
// impede our ability to determine directionality.
string16 name = UTF8ToUTF16(extension->name());
base::i18n::UnadjustStringForLocaleDirection(&name);
- NewTabUI::SetUrlTitleAndDirection(value, name, extension->GetFullLaunchURL());
+ NewTabUI::SetUrlTitleAndDirection(
+ value, name, extensions::AppLauncherInfo::GetFullLaunchURL(extension));
bool enabled = service->IsExtensionEnabled(extension->id()) &&
!service->GetTerminatedExtension(extension->id());
@@ -125,7 +127,8 @@ void AppLauncherHandler::CreateAppInfo(
false, &icon_small_exists);
value->SetString("icon_small", icon_small.spec());
value->SetBoolean("icon_small_exists", icon_small_exists);
- value->SetInteger("launch_container", extension->launch_container());
+ value->SetInteger("launch_container",
+ extensions::AppLauncherInfo::GetLaunchContainer(extension));
ExtensionPrefs* prefs = service->extension_prefs();
value->SetInteger("launch_type",
prefs->GetLaunchType(extension,

Powered by Google App Engine
This is Rietveld 408576698