Extension ID should be converted to app name when it is passed to the Browser.

chrome/browser/ui/browser_navigator.cc

 // Copyright (c) 2011 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/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 namespace {
 
 // Returns an appropriate SiteInstance for WebUI URLs, or the SiteInstance for
 // |source_contents| if it represents the same website as |url|.  Returns NULL
@@ skipping 104 matching lines @@
       // re-run with NEW_WINDOW.
       if (profile)
         return GetOrCreateBrowser(profile);
       return NULL;
     case NEW_POPUP: {
       // Make a new popup window.
       if (profile) {
         // Coerce app-style if |params->browser| or |source| represents an app.
         std::string app_name;
         if (!params->extension_app_id.empty()) {
-          app_name = params->extension_app_id;
+          app_name = web_app::GenerateApplicationNameFromExtensionId(
+              params->extension_app_id);
         } else if (params->browser && !params->browser->app_name().empty()) {
           app_name = params->browser->app_name();
         } else if (params->source_contents &&
                    params->source_contents->extension_tab_helper()->is_app()) {
-          app_name = params->source_contents->extension_tab_helper()->
-              extension_app()->id();
+          app_name = web_app::GenerateApplicationNameFromExtensionId(
+              params->source_contents->extension_tab_helper()->
+                  extension_app()->id());
         }
         if (app_name.empty()) {
           Browser::CreateParams browser_params(Browser::TYPE_POPUP, profile);
           browser_params.initial_bounds = params->window_bounds;
           return Browser::CreateWithParams(browser_params);
         } else {
           return Browser::CreateForApp(Browser::TYPE_POPUP, app_name,
                                        params->window_bounds, profile);
         }
       }
@@ skipping 364 matching lines @@
                                     rewritten_url, replacements)) {
       params->target_contents = tab;
       return tab_index;
     }
   }
 
   return -1;
 }
 
 }  // namespace browser