| Index: chrome/browser/ui/extensions/hosted_app_browser_controller.cc
|
| diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
|
| index 25aec3a079427b8d0422f3a49c3b1132c8c5eba9..5acd5724deb33a546a777410e1f64a0287c782f0 100644
|
| --- a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
|
| +++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
|
| @@ -12,7 +12,6 @@
|
| #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"
|
| @@ -32,14 +31,6 @@ bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) {
|
| 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
|
| @@ -60,21 +51,11 @@ HostedAppBrowserController::HostedAppBrowserController(Browser* browser)
|
| 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
|
| }
|
|
|
| HostedAppBrowserController::~HostedAppBrowserController() {
|
| }
|
|
|
| -bool HostedAppBrowserController::SupportsLocationBar() const {
|
| - return !should_use_web_app_frame();
|
| -}
|
| -
|
| bool HostedAppBrowserController::ShouldShowLocationBar() const {
|
| const Extension* extension =
|
| ExtensionRegistry::Get(browser_->profile())->GetExtensionById(
|
| @@ -113,9 +94,6 @@ bool HostedAppBrowserController::ShouldShowLocationBar() const {
|
|
|
| void HostedAppBrowserController::UpdateLocationBarVisibility(
|
| bool animate) const {
|
| - if (!SupportsLocationBar())
|
| - return;
|
| -
|
| browser_->window()->GetLocationBar()->UpdateLocationBarVisibility(
|
| ShouldShowLocationBar(), animate);
|
| }
|
|
|