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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
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/wm/immersive_fullscreen_controller.h" 5 #include "ash/wm/immersive_fullscreen_controller.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "ash/ash_constants.h" 9 #include "ash/ash_constants.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Start / stop observing changes to |bubble|'s visibility. 137 // Start / stop observing changes to |bubble|'s visibility.
138 void StartObserving(aura::Window* bubble); 138 void StartObserving(aura::Window* bubble);
139 void StopObserving(aura::Window* bubble); 139 void StopObserving(aura::Window* bubble);
140 140
141 private: 141 private:
142 // Updates |revealed_lock_| based on whether any of |bubbles_| is visible. 142 // Updates |revealed_lock_| based on whether any of |bubbles_| is visible.
143 void UpdateRevealedLock(); 143 void UpdateRevealedLock();
144 144
145 // aura::WindowObserver overrides: 145 // aura::WindowObserver overrides:
146 virtual void OnWindowVisibilityChanged(aura::Window* window, 146 virtual void OnWindowVisibilityChanged(aura::Window* window,
147 bool visible) OVERRIDE; 147 bool visible) override;
148 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 148 virtual void OnWindowDestroying(aura::Window* window) override;
149 149
150 ImmersiveFullscreenController* controller_; 150 ImmersiveFullscreenController* controller_;
151 151
152 std::set<aura::Window*> bubbles_; 152 std::set<aura::Window*> bubbles_;
153 153
154 // Lock which keeps the top-of-window views revealed based on whether any of 154 // Lock which keeps the top-of-window views revealed based on whether any of
155 // |bubbles_| is visible. 155 // |bubbles_| is visible.
156 scoped_ptr<ImmersiveRevealedLock> revealed_lock_; 156 scoped_ptr<ImmersiveRevealedLock> revealed_lock_;
157 157
158 DISALLOW_COPY_AND_ASSIGN(BubbleManager); 158 DISALLOW_COPY_AND_ASSIGN(BubbleManager);
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 AsBubbleDelegate(transient_child); 948 AsBubbleDelegate(transient_child);
949 if (bubble_delegate && 949 if (bubble_delegate &&
950 bubble_delegate->GetAnchorView() && 950 bubble_delegate->GetAnchorView() &&
951 top_container_->Contains(bubble_delegate->GetAnchorView())) { 951 top_container_->Contains(bubble_delegate->GetAnchorView())) {
952 bubble_manager_->StartObserving(transient_child); 952 bubble_manager_->StartObserving(transient_child);
953 } 953 }
954 } 954 }
955 } 955 }
956 956
957 } // namespace ash 957 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/immersive_fullscreen_controller.h ('k') | ash/wm/immersive_fullscreen_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698