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

Side by Side Diff: chrome/browser/ui/views/frame/immersive_mode_controller_ash.h

Issue 16998006: Add handling for immersive fullscreen to the zoom bubble (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ZoomBubbleBrowserTest.NonImmersiveFullscreen Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
7 7
8 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 8 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
9 9
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // when immersive mode is enabled and the top-of-window views are closed. 245 // when immersive mode is enabled and the top-of-window views are closed.
246 TabIndicatorVisibility tab_indicator_visibility_; 246 TabIndicatorVisibility tab_indicator_visibility_;
247 247
248 // Timer to track cursor being held at the top edge of the screen. 248 // Timer to track cursor being held at the top edge of the screen.
249 base::OneShotTimer<ImmersiveModeController> top_edge_hover_timer_; 249 base::OneShotTimer<ImmersiveModeController> top_edge_hover_timer_;
250 250
251 // The cursor x position in root coordinates when the cursor first hit 251 // The cursor x position in root coordinates when the cursor first hit
252 // the top edge of the screen. 252 // the top edge of the screen.
253 int mouse_x_when_hit_top_; 253 int mouse_x_when_hit_top_;
254 254
255 // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the
256 // following events.
257 bool gesture_begun_;
258
255 // The current visible bounds of the find bar, in screen coordinates. This is 259 // The current visible bounds of the find bar, in screen coordinates. This is
256 // an empty rect if the find bar is not visible. 260 // an empty rect if the find bar is not visible.
257 gfx::Rect find_bar_visible_bounds_in_screen_; 261 gfx::Rect find_bar_visible_bounds_in_screen_;
258 262
259 // Lock which keeps the top-of-window views revealed based on the current 263 // Lock which keeps the top-of-window views revealed based on the current
260 // mouse state and the current touch state. Acquiring the lock is used to 264 // mouse state and the current touch state. Acquiring the lock is used to
261 // trigger a reveal when the user moves the mouse to the top of the screen 265 // trigger a reveal when the user moves the mouse to the top of the screen
262 // and when the user does a SWIPE_OPEN edge gesture. 266 // and when the user does a SWIPE_OPEN edge gesture.
263 scoped_ptr<ImmersiveRevealedLock> located_event_revealed_lock_; 267 scoped_ptr<ImmersiveRevealedLock> located_event_revealed_lock_;
264 268
(...skipping 12 matching lines...) Expand all
277 bool animations_disabled_for_test_; 281 bool animations_disabled_for_test_;
278 282
279 // Manages widgets which are anchored to the top-of-window views. 283 // Manages widgets which are anchored to the top-of-window views.
280 class AnchoredWidgetManager; 284 class AnchoredWidgetManager;
281 scoped_ptr<AnchoredWidgetManager> anchored_widget_manager_; 285 scoped_ptr<AnchoredWidgetManager> anchored_widget_manager_;
282 286
283 content::NotificationRegistrar registrar_; 287 content::NotificationRegistrar registrar_;
284 288
285 base::WeakPtrFactory<ImmersiveModeControllerAsh> weak_ptr_factory_; 289 base::WeakPtrFactory<ImmersiveModeControllerAsh> weak_ptr_factory_;
286 290
287 // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the
288 // following events.
289 bool gesture_begun_;
290
291 DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAsh); 291 DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAsh);
292 }; 292 };
293 293
294 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_ 294 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698