Make ChromeOS shelf use Browser app name to group hosted app windows.

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.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/app_shortcut_launcher_item_controller.h"
 
 #include "apps/ui/native_app_window.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
-#include "chrome/browser/favicon/favicon_tab_helper.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.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/extensions/manifest_handlers/app_launch_info.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/views/corewm/window_animations.h"
 
 using extensions::Extension;
@@ skipping 141 matching lines @@
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
     Browser* browser = *it;
     if (!launcher_controller()->IsBrowserFromActiveUser(browser))
       continue;
     TabStripModel* tab_strip = browser->tab_strip_model();
     for (int index = 0; index < tab_strip->count(); index++) {
       content::WebContents* web_contents = tab_strip->GetWebContentsAt(index);
       if (WebContentMatchesApp(
-              extension, refocus_pattern, web_contents, browser->is_app()))
+              extension, refocus_pattern, web_contents, browser))
         items.push_back(web_contents);
     }
   }
   return items;
 }
 
 bool AppShortcutLauncherItemController::ItemSelected(const ui::Event& event) {
   // In case of a keyboard event, we were called by a hotkey. In that case we
   // activate the next item in line if an item of our list is already active.
   if (event.type() == ui::ET_KEY_RELEASED) {
@@ skipping 51 matching lines @@
     Browser* browser = *it;
     if (!CanBrowserBeUsedForDirectActivation(browser, launcher_controller()))
       continue;
     TabStripModel* tab_strip = browser->tab_strip_model();
     // We start to enumerate from the active index.
     int active_index = tab_strip->active_index();
     for (int index = 0; index < tab_strip->count(); index++) {
       content::WebContents* web_contents = tab_strip->GetWebContentsAt(
           (index + active_index) % tab_strip->count());
       if (WebContentMatchesApp(
-              extension, refocus_pattern, web_contents, browser->is_app()))
+              extension, refocus_pattern, web_contents, browser))
         return web_contents;
     }
   }
   // Coming here our application was not in the LRU list. This could have
   // happened because it did never get activated yet. So check the browser list
   // as well.
   for (BrowserList::const_iterator it = ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
     Browser* browser = *it;
     if (!CanBrowserBeUsedForDirectActivation(browser, launcher_controller()))
       continue;
     TabStripModel* tab_strip = browser->tab_strip_model();
     for (int index = 0; index < tab_strip->count(); index++) {
       content::WebContents* web_contents = tab_strip->GetWebContentsAt(index);
       if (WebContentMatchesApp(
-              extension, refocus_pattern, web_contents, browser->is_app()))
+              extension, refocus_pattern, web_contents, browser))
         return web_contents;
     }
   }
   return NULL;
 }
 
 bool AppShortcutLauncherItemController::WebContentMatchesApp(
     const extensions::Extension* extension,
     const URLPattern& refocus_pattern,
     content::WebContents* web_contents,
-    bool is_app) {
-  // Note: We can come here when the initial navigation isn't completed and
-  // no entry was yet created.
-  const GURL tab_url = is_app && web_contents->GetController().GetEntryCount() ?
-      web_contents->GetController().GetEntryAtIndex(0)->GetURL() :
-      web_contents->GetURL();
+    Browser* browser) {
+  const extensions::Extension* browser_extension = NULL;
+  if (browser->is_app()) {
+    const ExtensionService* extension_service =
+        browser->profile()->GetExtensionService();
+    if (extension_service) {
+      browser_extension = extension_service->GetInstalledExtension(
+          web_app::GetExtensionIdFromApplicationName(browser->app_name()));
+    }
+  }
   // There are three ways to identify the association of a URL with this
   // extension:
   // - The refocus pattern is matched (needed for apps like drive).
-  // - The extension's origin + extent gets matched.
+  // - The browser is an app window and the app name matches the extension.
   // - The launcher controller knows that the tab got created for this app.
   return ((!refocus_pattern.match_all_urls() &&
-           refocus_pattern.MatchesURL(tab_url)) ||
-          (extension->OverlapsWithOrigin(tab_url) &&
-           extension->web_extent().MatchesURL(tab_url)) ||
+           refocus_pattern.MatchesURL(web_contents->GetURL())) ||

[Mr4D (OOO till 08-26), 2014/02/07 17:44:03]

You cannot remove the line 299&300 since this matching is also performed on tabs
(which are no apps per definition - but they might match). So you should or that
in - or - create two separate cases for apps and tabs.

[calamity, 2014/02/17 02:03:17]

Done.

+          extension == browser_extension ||
           launcher_controller()->IsWebContentHandledByApplication(web_contents,
                                                                   app_id()));
 }
 
 void AppShortcutLauncherItemController::ActivateContent(
     content::WebContents* content) {
   Browser* browser = chrome::FindBrowserWithWebContents(content);
   TabStripModel* tab_strip = browser->tab_strip_model();
   int index = tab_strip->GetIndexOfWebContents(content);
   DCHECK_NE(TabStripModel::kNoTab, index);
@@ skipping 42 matching lines @@
 
 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() {
   if (last_launch_attempt_.is_null() ||
       last_launch_attempt_ + base::TimeDelta::FromMilliseconds(
           kClickSuppressionInMS) < base::Time::Now()) {
     last_launch_attempt_ = base::Time::Now();
     return true;
   }
   return false;
 }