Use the correct title for the bookmark app bubble.

chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc

 // Copyright 2014 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/views/extensions/bookmark_app_bubble_view.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
@@ skipping 75 matching lines @@
   const SkColor background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
   set_arrow(views::BubbleBorder::TOP_CENTER);
   set_color(background_color);
   set_background(views::Background::CreateSolidBackground(background_color));
   set_margins(gfx::Insets(views::kPanelVertMargin, 0, 0, 0));
 }
 
 void BookmarkAppBubbleView::Init() {
   views::Label* title_label = new views::Label(
-      l10n_util::GetStringUTF16(IDS_BOOKMARK_APP_BUBBLE_TITLE));
+      l10n_util::GetStringUTF16(TitleStringId()));
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   title_label->SetFontList(rb->GetFontList(ui::ResourceBundle::MediumFont));
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   add_button_ =
       new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_ADD));
   add_button_->SetStyle(views::Button::STYLE_BUTTON);
   add_button_->SetIsDefault(true);
 
   cancel_button_ =
@@ skipping 95 matching lines @@
     const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_RETURN) {
     HandleButtonPressed(add_button_);
   }
 
   return BubbleDelegateView::AcceleratorPressed(accelerator);
 }
 
 void BookmarkAppBubbleView::GetAccessibleState(ui::AXViewState* state) {
   views::BubbleDelegateView::GetAccessibleState(state);
-  state->name = l10n_util::GetStringUTF16(IDS_BOOKMARK_APP_BUBBLE_TITLE);
+  state->name = l10n_util::GetStringUTF16(TitleStringId());
 }
 
 gfx::Size BookmarkAppBubbleView::GetMinimumSize() const {
   gfx::Size size(views::BubbleDelegateView::GetPreferredSize());
   size.SetToMax(gfx::Size(kMinBubbleWidth, 0));
   return size;
 }
 
 void BookmarkAppBubbleView::ButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
@@ skipping 14 matching lines @@
     web_app_info_.open_as_window = open_as_window_checkbox_->checked();
   }
 
   GetWidget()->Close();
 }
 
 void BookmarkAppBubbleView::UpdateAddButtonState() {
   add_button_->SetEnabled(!GetTrimmedTitle().empty());
 }
 
+int BookmarkAppBubbleView::TitleStringId() {
+#if defined(OS_WIN)
+    int string_id = IDS_ADD_TO_TASKBAR_BUBBLE_TITLE;
+#else
+    int string_id = IDS_ADD_TO_DESKTOP_BUBBLE_TITLE;
+#endif
+#if defined(USE_ASH)
+    if (chrome::GetHostDesktopTypeForNativeWindow(
+            anchor_widget()->GetNativeWindow()) ==
+        chrome::HOST_DESKTOP_TYPE_ASH) {
+      string_id = IDS_ADD_TO_SHELF_BUBBLE_TITLE;
+    }
+#endif
+    return string_id;
+}
+
 base::string16 BookmarkAppBubbleView::GetTrimmedTitle() {
   base::string16 title(title_tf_->text());
   base::TrimWhitespace(title, base::TRIM_ALL, &title);
   return title;
 }