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

Unified Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 8895003: Aura: Add --aura-laptop-mode to fill the workspace with a single window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments 1 Created 9 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
Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index d4dc34a0140d56db5296fdda61f61d9d33d37d9a..0d54dcf4b24576b4c637ba4efdbe506a6dfab598 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -69,6 +69,7 @@ void BrowserFrame::InitBrowserFrame() {
params.transparent = true;
#endif
Init(params);
+ // TODO(jamescook): Do this for Aura laptop mode?
oshima 2011/12/13 00:47:47 you probably want to do this for laptop mode.
James Cook 2011/12/13 18:19:13 Done.
#if defined(OS_CHROMEOS) && !defined(USE_AURA)
// On ChromeOS we always want top-level windows to appear active.
if (!browser_view_->IsBrowserTypePopup())
@@ -105,16 +106,26 @@ void BrowserFrame::TabStripDisplayModeChanged() {
native_browser_frame_->TabStripDisplayModeChanged();
}
+bool BrowserFrame::IsSingleWindowMode() const {
+ bool single_window_mode = false;
+#if defined(USE_AURA)
+ single_window_mode =
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraLaptopMode);
+#elif defined(OS_CHROMEOS)
+ single_window_mode =
+ chromeos::system::runtime_environment::IsRunningOnChromeOS();
+#endif
+ return single_window_mode;
+}
+
///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameWin, views::Window overrides:
+// BrowserFrame, views::Widget overrides:
bool BrowserFrame::IsMaximized() const {
James Cook 2011/12/13 18:19:13 I reverted this to the old way, and made it so tab
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
- if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
+ if (IsSingleWindowMode()) {
return !IsFullscreen() &&
(!browser_view_->IsBrowserTypePopup() || Widget::IsMaximized());
}
-#endif
return Widget::IsMaximized();
}

Powered by Google App Engine
This is Rietveld 408576698