Move the parsing of app.launch related keys out of Extension class.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
@@ skipping 24 matching lines @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/url_pattern.h"
 #include "grit/theme_resources.h"
 #include "ui/aura/root_window.h"
@@ skipping 11 matching lines @@
  public:
   AppShortcutLauncherItemController(
       const std::string& app_id,
       ChromeLauncherControllerPerBrowser* controller)
       : LauncherItemController(TYPE_SHORTCUT, app_id, controller) {
     // Google Drive should just refocus to it's main app UI.
     // TODO(davemoore): Generalize this for other applications.
     if (app_id == "apdfllckaahabafndbhieahigkjlhalf") {
       const Extension* extension =
           launcher_controller()->GetExtensionForAppID(app_id);
-      refocus_url_ = GURL(extension->launch_web_url() + "*");
+      refocus_url_ =
+          GURL(extensions::AppLauncherInfo::GetLaunchWebURL(extension) + "*");
     }
   }
 
   virtual ~AppShortcutLauncherItemController() {}
 
   // LauncherItemController overrides:
   virtual string16 GetTitle() OVERRIDE {
     return GetAppTitle();
   }
 
@@ skipping 1252 matching lines @@
 void ChromeLauncherControllerPerBrowser::SetAppIconLoaderForTest(
     extensions::AppIconLoader* loader) {
   app_icon_loader_.reset(loader);
 }
 
 const std::string&
 ChromeLauncherControllerPerBrowser::GetAppIdFromLauncherIdForTest(
     ash::LauncherID id) {
   return id_to_item_controller_map_[id]->app_id();
 }