Remove unreleased web app frame code from ChromeOS

chrome/browser/ui/extensions/hosted_app_browser_controller.cc

 // Copyright 2015 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/extensions/hosted_app_browser_controller.h"
 
-#include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) {
   const std::string www("www.");
   return (app_url.scheme_piece() == page_url.scheme_piece() ||
           page_url.scheme_piece() == url::kHttpsScheme) &&
          (app_url.host_piece() == page_url.host_piece() ||
           www + app_url.host() == page_url.host_piece()) &&
          app_url.port() == page_url.port();
 }
-
-#if defined(USE_ASH)
-bool IsWebAppFrameEnabled() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableWebAppFrame);
-}
-#endif  // USE_ASH
-
 }  // namespace
 
 // static
 bool HostedAppBrowserController::IsForHostedApp(Browser* browser) {
   const std::string extension_id =
       web_app::GetExtensionIdFromApplicationName(browser->app_name());
   const Extension* extension =
       ExtensionRegistry::Get(browser->profile())->GetExtensionById(
           extension_id, ExtensionRegistry::EVERYTHING);
   return extension && extension->is_hosted_app();
 }
 
 HostedAppBrowserController::HostedAppBrowserController(Browser* browser)
     : browser_(browser),
       extension_id_(
-          web_app::GetExtensionIdFromApplicationName(browser->app_name())) {
-  const Extension* extension =
-      ExtensionRegistry::Get(browser->profile())->GetExtensionById(
-          extension_id_, ExtensionRegistry::EVERYTHING);
-  DCHECK(extension);
-#if defined(USE_ASH)
-  should_use_web_app_frame_ =
-      extension->from_bookmark() && IsWebAppFrameEnabled();
-#else
-  should_use_web_app_frame_ = false;
-#endif
-}
+          web_app::GetExtensionIdFromApplicationName(browser->app_name())) {}
 
-HostedAppBrowserController::~HostedAppBrowserController() {
-}
-
-bool HostedAppBrowserController::SupportsLocationBar() const {
-  return !should_use_web_app_frame();
-}
+HostedAppBrowserController::~HostedAppBrowserController() {}
 
 bool HostedAppBrowserController::ShouldShowLocationBar() const {
   const Extension* extension =
       ExtensionRegistry::Get(browser_->profile())->GetExtensionById(
           extension_id_, ExtensionRegistry::EVERYTHING);
 
   const content::WebContents* web_contents =
       browser_->tab_strip_model()->GetActiveWebContents();
 
   // Default to not showing the location bar if either |extension| or
@@ skipping 19 matching lines @@
 
   GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
   return !(IsSameOriginOrMoreSecure(launch_url,
                                     web_contents->GetVisibleURL()) &&
            IsSameOriginOrMoreSecure(launch_url,
                                     web_contents->GetLastCommittedURL()));
 }
 
 void HostedAppBrowserController::UpdateLocationBarVisibility(
     bool animate) const {
-  if (!SupportsLocationBar())
-    return;
-
   browser_->window()->GetLocationBar()->UpdateLocationBarVisibility(
       ShouldShowLocationBar(), animate);
 }
 
 }  // namespace extensions