[ash-md] Uses 'Chrome - <title>' format for browser windows in overview

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 567 matching lines @@
   WebContents* web_contents = tab_strip_model_->GetActiveWebContents();
   // |web_contents| can be NULL since GetCurrentPageIcon() is called by the
   // window during the window's creation (before tabs have been added).
   favicon::FaviconDriver* favicon_driver =
       web_contents
           ? favicon::ContentFaviconDriver::FromWebContents(web_contents)
           : nullptr;
   return favicon_driver ? favicon_driver->GetFavicon() : gfx::Image();
 }
 
-base::string16 Browser::GetWindowTitleForCurrentTab() const {
+base::string16 Browser::GetWindowTitleForCurrentTab(
+    bool include_app_name) const {
   WebContents* contents = tab_strip_model_->GetActiveWebContents();
   base::string16 title;
 
   // |contents| can be NULL because GetWindowTitleForCurrentTab is called by the
   // window during the window's creation (before tabs have been added).
   if (contents) {
     // The web app frame uses the host instead of the title.
     if (ShouldUseWebAppFrame())
       return base::UTF8ToUTF16(contents->GetURL().host());
 
     title = contents->GetTitle();
     FormatTitleForDisplay(&title);
   }
   if (title.empty())
     title = CoreTabHelper::GetDefaultTitle();
 
-#if defined(OS_MACOSX) || defined(USE_ASH)
-  // On Mac and Ash, we don't want to suffix the page title with the application
-  // name.
+#if defined(OS_MACOSX)
+  // On Mac, we don't want to suffix the page title with the application name.
   return title;
 #endif
-  // Don't append the app name to window titles on app frames and app popups
-  return is_app() ?
-      title :
-      l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, title);
+  // Include the app name in window titles for tabbed browser windows when
+  // requested with |include_app_name|.
+  return (!is_app() && include_app_name) ?
+      l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, title):
+      title;
 }
 
 // static
 void Browser::FormatTitleForDisplay(base::string16* title) {
   size_t current_index = 0;
   size_t match_index;
   while ((match_index = title->find(L'\n', current_index)) !=
          base::string16::npos) {
     title->replace(match_index, 1, base::string16());
     current_index = match_index;
@@ skipping 1974 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }