Remove unreleased web app frame code from ChromeOS

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 565 matching lines @@
 }
 
 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)
   // On Mac, we don't want to suffix the page title with the application name.
   return title;
 #endif
@@ skipping 1801 matching lines @@
 bool Browser::SupportsLocationBar() const {
   // Tabbed browser always show a location bar.
   if (is_type_tabbed())
     return true;
 
   // Non-app windows that aren't tabbed or system windows should always show a
   // location bar, unless they are from a trusted source.
   if (!is_app())
     return !is_trusted_source();
 
+  // Hosted apps always support a location bar.
   if (hosted_app_controller_)
-    return hosted_app_controller_->SupportsLocationBar();
+    return true;
 
   return false;
 }
-
-bool Browser::ShouldUseWebAppFrame() const {
-  // Only use the web app frame for apps in ash, and only if the web app frame
-  // is enabled.
-  if (!is_app())
-    return false;
-
-  if (hosted_app_controller_)
-    return hosted_app_controller_->should_use_web_app_frame();
-
-  return false;
-}
 
 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
                                         bool check_fullscreen) const {
   bool hide_ui_for_fullscreen = check_fullscreen && ShouldHideUIForFullscreen();
 
   unsigned int features = FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF;
 
   if (is_type_tabbed())
     features |= FEATURE_BOOKMARKBAR;
 
   if (!hide_ui_for_fullscreen) {
     if (!is_type_tabbed())
       features |= FEATURE_TITLEBAR;
 
     if (is_type_tabbed())
       features |= FEATURE_TABSTRIP;
 
     if (is_type_tabbed())
       features |= FEATURE_TOOLBAR;
 
     if (SupportsLocationBar())
       features |= FEATURE_LOCATIONBAR;
-
-    if (ShouldUseWebAppFrame())
-      features |= FEATURE_WEBAPPFRAME;
   }
   return !!(features & feature);
 }
 
 void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467185 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "467185 Browser::UpdateBookmarkBarState1"));
@@ skipping 137 matching lines @@
     // new window later, thus we need to navigate the window now.
     if (contents) {
       contents->web_contents()->GetController().LoadURL(
           target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
           std::string());  // No extra headers.
     }
   }
 
   return contents != NULL;
 }