Remove host_desktop_type() from browser.h

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 360 matching lines @@
       window_(NULL),
       tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)),
       tab_strip_model_(
           new TabStripModel(tab_strip_model_delegate_.get(), params.profile)),
       app_name_(params.app_name),
       is_trusted_source_(params.trusted_source),
       cancel_download_confirmation_state_(NOT_PROMPTED),
       override_bounds_(params.initial_bounds),
       initial_show_state_(params.initial_show_state),
       is_session_restore_(params.is_session_restore),
-      host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
       content_setting_bubble_model_delegate_(
           new BrowserContentSettingBubbleModelDelegate(this)),
       toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
       live_tab_context_(new BrowserLiveTabContext(this)),
       synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
       bookmark_bar_state_(BookmarkBar::HIDDEN),
       command_controller_(new chrome::BrowserCommandController(this)),
       window_has_shown_(false),
       chrome_updater_factory_(this),
       weak_factory_(this) {
@@ skipping 225 matching lines @@
     // 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)
-  // On Mac, we don't want to suffix the page title with
-  // the application name.
+#if defined(OS_MACOSX) || defined(USE_ASH)
+  // On Mac and Ash, we don't want to suffix the page title with the application
+  // name.
   return title;
-#elif defined(USE_ASH)
-  // On Ash, we don't want to suffix the page title with the application name,
-  // but on Windows, where USE_ASH can also be true, we still want the prefix
-  // on desktop.
-  if (host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
-    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);
 }
 
 // static
 void Browser::FormatTitleForDisplay(base::string16* title) {
   size_t current_index = 0;
@@ skipping 2090 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;
 }