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

Unified Diff: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc

Issue 12316077: 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, 9 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/ash/launcher/app_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
index 50751c3ea06f2a2925d01dfe3c22594b0fc1be58..7e8113691d9614069236b1ac15de93634ac30366 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/extensions/native_app_window.h"
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/extensions/app_launcher_info.h"
#include "content/public/browser/web_contents.h"
#include "ui/aura/window.h"
@@ -35,9 +36,11 @@ AppShortcutLauncherItemController::AppShortcutLauncherItemController(
// used URL. This will also work with applications like Google Drive.
const Extension* extension =
launcher_controller()->GetExtensionForAppID(app_id);
- // Some unit tests have no real extension and will set their
- if (extension)
- set_refocus_url(GURL(extension->launch_web_url() + "*"));
+ // Some unit tests have no real extension.
+ if (extension) {
+ set_refocus_url(
+ GURL(extensions::AppLauncherInfo::GetLaunchWebURL(extension) + "*"));
+ }
}
AppShortcutLauncherItemController::~AppShortcutLauncherItemController() {

Powered by Google App Engine
This is Rietveld 408576698