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

Side by Side Diff: chrome/browser/ui/panels/display_settings_provider.cc

Issue 12430013: Fix panel showing logic when Chrome enters the fullscreen mode (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix per feedback Created 7 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/panels/display_settings_provider.h" 5 #include "chrome/browser/ui/panels/display_settings_provider.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/fullscreen.h" 8 #include "chrome/browser/fullscreen.h"
9 #include "ui/gfx/screen.h" 9 #include "ui/gfx/screen.h"
10 10
(...skipping 23 matching lines...) Expand all
34 desktop_bar_observers_.AddObserver(observer); 34 desktop_bar_observers_.AddObserver(observer);
35 } 35 }
36 36
37 void DisplaySettingsProvider::RemoveDesktopBarObserver( 37 void DisplaySettingsProvider::RemoveDesktopBarObserver(
38 DesktopBarObserver* observer) { 38 DesktopBarObserver* observer) {
39 desktop_bar_observers_.RemoveObserver(observer); 39 desktop_bar_observers_.RemoveObserver(observer);
40 } 40 }
41 41
42 void DisplaySettingsProvider::AddFullScreenObserver( 42 void DisplaySettingsProvider::AddFullScreenObserver(
43 FullScreenObserver* observer) { 43 FullScreenObserver* observer) {
44 is_full_screen_ = IsFullScreen();
44 full_screen_observers_.AddObserver(observer); 45 full_screen_observers_.AddObserver(observer);
45 46
46 if (full_screen_observers_.size() == 1 && NeedsPeriodicFullScreenCheck()) { 47 if (full_screen_observers_.size() == 1 && NeedsPeriodicFullScreenCheck()) {
47 full_screen_mode_timer_.Start(FROM_HERE, 48 full_screen_mode_timer_.Start(FROM_HERE,
48 base::TimeDelta::FromMilliseconds(kFullScreenModeCheckIntervalMs), 49 base::TimeDelta::FromMilliseconds(kFullScreenModeCheckIntervalMs),
49 this, &DisplaySettingsProvider::CheckFullScreenMode); 50 this, &DisplaySettingsProvider::CheckFullScreenMode);
50 } 51 }
51 } 52 }
52 53
53 void DisplaySettingsProvider::RemoveFullScreenObserver( 54 void DisplaySettingsProvider::RemoveFullScreenObserver(
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 bool is_full_screen = IsFullScreen(); 131 bool is_full_screen = IsFullScreen();
131 if (is_full_screen == is_full_screen_) 132 if (is_full_screen == is_full_screen_)
132 return; 133 return;
133 is_full_screen_ = is_full_screen; 134 is_full_screen_ = is_full_screen;
134 135
135 FOR_EACH_OBSERVER(FullScreenObserver, 136 FOR_EACH_OBSERVER(FullScreenObserver,
136 full_screen_observers_, 137 full_screen_observers_,
137 OnFullScreenModeChanged(is_full_screen_)); 138 OnFullScreenModeChanged(is_full_screen_));
138 } 139 }
139 140
140 bool DisplaySettingsProvider::IsFullScreen() const { 141 bool DisplaySettingsProvider::IsFullScreen() {
141 return IsFullScreenMode(); 142 return IsFullScreenMode();
142 } 143 }
143 144
144 #if defined(USE_AURA) 145 #if defined(USE_AURA)
145 // static 146 // static
146 DisplaySettingsProvider* DisplaySettingsProvider::Create() { 147 DisplaySettingsProvider* DisplaySettingsProvider::Create() {
147 return new DisplaySettingsProvider(); 148 return new DisplaySettingsProvider();
148 } 149 }
149 #endif 150 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/display_settings_provider.h ('k') | chrome/browser/ui/panels/docked_panel_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698