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

Side by Side Diff: ash/shared/immersive_fullscreen_controller.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 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
« no previous file with comments | « ash/shared/immersive_fullscreen_controller.h ('k') | ash/shell/window_watcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/shared/immersive_fullscreen_controller.h" 5 #include "ash/shared/immersive_fullscreen_controller.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "ash/shared/immersive_context.h" 9 #include "ash/shared/immersive_context.h"
10 #include "ash/shared/immersive_focus_watcher.h" 10 #include "ash/shared/immersive_focus_watcher.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 const ui::TouchEvent touch_event(event); 246 const ui::TouchEvent touch_event(event);
247 OnTouchEvent(touch_event, location_in_screen); 247 OnTouchEvent(touch_event, location_in_screen);
248 } 248 }
249 } 249 }
250 250
251 //////////////////////////////////////////////////////////////////////////////// 251 ////////////////////////////////////////////////////////////////////////////////
252 // views::WidgetObserver overrides: 252 // views::WidgetObserver overrides:
253 253
254 void ImmersiveFullscreenController::OnWidgetDestroying(views::Widget* widget) { 254 void ImmersiveFullscreenController::OnWidgetDestroying(views::Widget* widget) {
255 EnableWindowObservers(false); 255 EnableWindowObservers(false);
256 widget_window_ = nullptr;
257 256
258 // Set |enabled_| to false such that any calls to MaybeStartReveal() and 257 // Set |enabled_| to false such that any calls to MaybeStartReveal() and
259 // MaybeEndReveal() have no effect. 258 // MaybeEndReveal() have no effect.
260 enabled_ = false; 259 enabled_ = false;
261 } 260 }
262 261
263 //////////////////////////////////////////////////////////////////////////////// 262 ////////////////////////////////////////////////////////////////////////////////
264 // gfx::AnimationDelegate overrides: 263 // gfx::AnimationDelegate overrides:
265 264
266 void ImmersiveFullscreenController::AnimationEnded( 265 void ImmersiveFullscreenController::AnimationEnded(
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 location.y() < hit_bounds_in_screen.y() && 641 location.y() < hit_bounds_in_screen.y() &&
643 location.x() >= hit_bounds_in_screen.x() && 642 location.x() >= hit_bounds_in_screen.x() &&
644 location.x() < hit_bounds_in_screen.right()); 643 location.x() < hit_bounds_in_screen.right());
645 } 644 }
646 645
647 gfx::Rect ImmersiveFullscreenController::GetDisplayBoundsInScreen() const { 646 gfx::Rect ImmersiveFullscreenController::GetDisplayBoundsInScreen() const {
648 return ImmersiveContext::Get()->GetDisplayBoundsInScreen(widget_); 647 return ImmersiveContext::Get()->GetDisplayBoundsInScreen(widget_);
649 } 648 }
650 649
651 } // namespace ash 650 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shared/immersive_fullscreen_controller.h ('k') | ash/shell/window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698