Set Browser::app_name_ in a reasonable way for extension apps.

chrome/browser/ui/browser.cc

 // Copyright (c) 2010 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.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 524 matching lines @@
   GURL url;
   if (!url_input.is_empty()) {
     if (extension)
       DCHECK(extension->web_extent().ContainsURL(url_input));
     url = url_input;
   } else {
     DCHECK(extension);
     url = extension->GetFullLaunchURL();
   }
 
-  // TODO(erikkay) this can't be correct for extensions
-  std::string app_name = web_app::GenerateApplicationNameFromURL(url);
+  std::string app_name;
+  if (extension)
+    app_name =
+        web_app::GenerateApplicationNameFromExtensionId(extension->id());
+  else
+    app_name = web_app::GenerateApplicationNameFromURL(url);
+
   RegisterAppPrefs(app_name);
 
   bool as_panel = extension && (container == extension_misc::LAUNCH_PANEL);
 
   gfx::Size window_size;
   if (extension)
     window_size.SetSize(extension->launch_width(),
                         extension->launch_height());
 
   Browser* browser = Browser::CreateForApp(app_name, window_size, profile,
@@ skipping 3655 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(contents_dupe, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&new_contents->controller(), pinned);
   }
 }