Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(884)

Unified Diff: chrome/browser/ui/browser.cc

Issue 2552903003: Remove unreleased web app frame code from ChromeOS (Closed)
Patch Set: Nits Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/extensions/hosted_app_browser_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 09923f08525f78cfc0d5399b3182a25d342e9095..57561ce142c3c3a1c5281c68482bd4a28802a4f3 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -583,10 +583,6 @@ base::string16 Browser::GetWindowTitleForCurrentTab(
// |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);
}
@@ -2408,20 +2404,9 @@ bool Browser::SupportsLocationBar() const {
if (!is_app())
return !is_trusted_source();
+ // Hosted apps always support a location bar.
if (hosted_app_controller_)
Peter Kasting 2016/12/20 02:44:03 Nit: Shorter (but maybe you don't like this): r
benwells 2016/12/20 03:44:20 Hmmm ... yeah personally I prefer the explicit ret
Peter Kasting 2016/12/20 04:47:30 I'm fine with it as it is.
- return hosted_app_controller_->SupportsLocationBar();
-
- 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 true;
return false;
}
@@ -2447,9 +2432,6 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
if (SupportsLocationBar())
features |= FEATURE_LOCATIONBAR;
-
- if (ShouldUseWebAppFrame())
- features |= FEATURE_WEBAPPFRAME;
}
return !!(features & feature);
}
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/extensions/hosted_app_browser_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698