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

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

Issue 42353002: Introduce WindowStateDelegate::ToggleFullscreen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months 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_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc
index 07f4e332ebbf953b1a7b1912b59e0d2153efdc9b..dbafa3476d2d23b87212acc18a82fbe13e223a39 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -86,22 +86,20 @@ BrowserFrameAsh::BrowserFrameAsh(BrowserFrame* browser_frame,
window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) {
GetNativeWindow()->SetName(kWindowName);
GetNativeWindow()->AddObserver(window_property_watcher_.get());
- if (browser_view->browser()->is_type_tabbed())
- ash::wm::SetAnimateToFullscreen(GetNativeWindow(), false);
+ Browser* browser = browser_view->browser();
+ ash::wm::WindowState* window_state =
+ ash::wm::GetWindowState(GetNativeWindow());
pkotwicz 2013/10/29 00:46:01 This class needs a WindowStateDelegate. With the C
oshima 2013/10/29 02:05:42 Sorry I misunderstood your original comment. Fixed
+ window_state->set_animate_to_fullscreen(!browser->is_type_tabbed());
// Turn on auto window management if we don't need an explicit bounds.
// This way the requested bounds are honored.
- if (!browser_view->browser()->bounds_overridden() &&
- !browser_view->browser()->is_session_restore())
+ if (!browser->bounds_overridden() && !browser->is_session_restore())
SetWindowAutoManaged();
#if defined(OS_CHROMEOS)
// For legacy reasons v1 apps (like Secure Shell) are allowed to consume keys
// like brightness, volume, etc. Otherwise these keys are handled by the
// Ash window manager.
- if (browser_view->browser()->is_app()) {
- ash::wm::GetWindowState(GetNativeWindow())->
- set_can_consume_system_keys(true);
- }
+ window_state->set_can_consume_system_keys(browser->is_app());
#endif // defined(OS_CHROMEOS)
}

Powered by Google App Engine
This is Rietveld 408576698