Launch non-shortcut apps in ChromeLauncherControllerPerApp

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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_app.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
@@ skipping 416 matching lines @@
 
 void ChromeLauncherControllerPerApp::ActivateApp(const std::string& app_id,
                                                  int event_flags) {
   if (app_id == extension_misc::kChromeAppId) {
     OnBrowserShortcutClicked(event_flags);
     return;
   }
 
   // If there is an existing non-shortcut controller for this app, open it.
   ash::LauncherID id = GetLauncherIDForAppID(app_id);
+  if (id) {
+    LauncherItemController* controller = id_to_item_controller_map_[id];
+    controller->Activate();
+    return;
+  }
 
-  // Only pinned applications will be handled.
-  if (!id)
-    return;
-
-  LauncherItemController* controller = id_to_item_controller_map_[id];
-  controller->Activate();
+  // Otherwise launch the app.
+  LaunchApp(app_id, event_flags);
 }
 
 extensions::ExtensionPrefs::LaunchType
     ChromeLauncherControllerPerApp::GetLaunchType(ash::LauncherID id) {
   DCHECK(HasItemController(id));
 
   const Extension* extension = GetExtensionForAppID(
       id_to_item_controller_map_[id]->app_id());
   return profile_->GetExtensionService()->extension_prefs()->GetLaunchType(
       extension,
@@ skipping 780 matching lines @@
     FaviconTabHelper* favicon_tab_helper =
         FaviconTabHelper::FromWebContents(web_contents);
     gfx::Image app_icon = favicon_tab_helper->GetFavicon();
     items->push_back(new ChromeLauncherAppMenuItemBrowser(
                              web_contents->GetTitle(),
                              app_icon.IsEmpty() ? NULL : &app_icon,
                              browser));
   }
   return items;
 }