Change the name of the browser item in the launcher

BUG=173019
TST=visual


Review URL: https://chromiumcodereview.appspot.com/12143003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180098 0039d316-1c4b-4281-b951-d872f2087c98

ash/launcher/launcher_view.cc

@@ -1166,7 +1166,7 @@ string16 LauncherView::GetAccessibleName(const views::View* view) {
           l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
 
     case TYPE_BROWSER_SHORTCUT:
-      return l10n_util::GetStringUTF16(IDS_AURA_NEW_TAB);
+      return Shell::GetInstance()->delegate()->GetProductName();
   }
   return string16();
 }

ash/shell/shell_delegate_impl.cc

@@ -218,5 +218,9 @@ RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() {
   return RootWindowHostFactory::Create();
 }
 
+string16 ShellDelegateImpl::GetProductName() const {
+  return string16();
+}
+
 }  // namespace shell
 }  // namespace ash

ash/shell/shell_delegate_impl.h

@@ -70,6 +70,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual ui::MenuModel* CreateContextMenu(
       aura::RootWindow* root_window) OVERRIDE;
   virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
+  virtual string16 GetProductName() const OVERRIDE;
 
  private:
   // Used to update Launcher. Owned by main.

ash/shell_delegate.h

@@ -229,6 +229,9 @@ class ASH_EXPORT ShellDelegate {
   // Creates a root window host factory. Shell takes ownership of the returned
   // value.
   virtual RootWindowHostFactory* CreateRootWindowHostFactory() = 0;
+
+  // Get the product name.
+  virtual string16 GetProductName() const = 0;
 };
 
 }  // namespace ash

ash/test/test_shell_delegate.cc

@@ -223,5 +223,10 @@ void TestShellDelegate::SetCanLockScreen(bool can_lock_screen) {
   can_lock_screen_ = can_lock_screen;
 }
 
+string16 TestShellDelegate::GetProductName() const {
+  return string16();
+}
+
+
 }  // namespace test
 }  // namespace ash

ash/test/test_shell_delegate.h

@@ -68,6 +68,7 @@ class TestShellDelegate : public ShellDelegate {
   virtual double GetSavedScreenMagnifierScale() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
   virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
+  virtual string16 GetProductName() const OVERRIDE;
 
   int num_exit_requests() const { return num_exit_requests_; }
  private:

chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -42,9 +42,11 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/window.h"
+#include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
@@ -596,6 +598,10 @@ ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() {
   return ash::RootWindowHostFactory::Create();
 }
 
+string16 ChromeShellDelegate::GetProductName() const {
+  return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+}
+
 void ChromeShellDelegate::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {

chrome/browser/ui/ash/chrome_shell_delegate.h

@@ -84,6 +84,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   virtual double GetSavedScreenMagnifierScale() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
   virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
+  virtual string16 GetProductName() const OVERRIDE;
 
   // content::NotificationObserver override:
   virtual void Observe(int type,