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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Issue 1176823002: Remove ChromeNativeAppWindowViews::is_fullscreen_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove TODO. Created 5 years, 6 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
« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
index 830d0491cae1b3884788c1439f11a3e0f1693163..4f1635a7e237c41135e87f301c63875430975d04 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -93,8 +93,7 @@ const std::map<ui::Accelerator, int>& GetAcceleratorTable() {
} // namespace
ChromeNativeAppWindowViews::ChromeNativeAppWindowViews()
- : is_fullscreen_(false),
- has_frame_color_(false),
+ : has_frame_color_(false),
active_frame_color_(SK_ColorBLACK),
inactive_frame_color_(SK_ColorBLACK) {
}
@@ -332,16 +331,12 @@ void ChromeNativeAppWindowViews::SetFullscreen(int fullscreen_types) {
// Fullscreen not supported by panels.
if (app_window()->window_type_is_panel())
return;
- is_fullscreen_ = (fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
- widget()->SetFullscreen(is_fullscreen_);
- // TODO(jeremya) we need to call RenderViewHost::ExitFullscreen() if we
- // ever drop the window out of fullscreen in response to something that
- // wasn't the app calling webkitCancelFullScreen().
+ widget()->SetFullscreen(fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
}
bool ChromeNativeAppWindowViews::IsFullscreenOrPending() const {
- return is_fullscreen_;
+ return widget()->IsFullscreen();
}
void ChromeNativeAppWindowViews::UpdateShape(scoped_ptr<SkRegion> region) {
« no previous file with comments | « chrome/browser/ui/views/apps/chrome_native_app_window_views.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698