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

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

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/drag_window_resizer_unittest.cc ('k') | ash/wm/immersive_fullscreen_controller.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 #ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ 5 #ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
6 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ 6 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 23 matching lines...) Expand all
34 namespace views { 34 namespace views {
35 class View; 35 class View;
36 class Widget; 36 class Widget;
37 } 37 }
38 38
39 namespace ash { 39 namespace ash {
40 40
41 class ASH_EXPORT ImmersiveFullscreenController 41 class ASH_EXPORT ImmersiveFullscreenController
42 : public gfx::AnimationDelegate, 42 : public gfx::AnimationDelegate,
43 public ui::EventHandler, 43 public ui::EventHandler,
44 public views::corewm::TransientWindowObserver, 44 public ::wm::TransientWindowObserver,
45 public views::FocusChangeListener, 45 public views::FocusChangeListener,
46 public views::WidgetObserver, 46 public views::WidgetObserver,
47 public ImmersiveRevealedLock::Delegate { 47 public ImmersiveRevealedLock::Delegate {
48 public: 48 public:
49 // The enum is used for an enumerated histogram. New items should be only 49 // The enum is used for an enumerated histogram. New items should be only
50 // added to the end. 50 // added to the end.
51 enum WindowType { 51 enum WindowType {
52 WINDOW_TYPE_OTHER, 52 WINDOW_TYPE_OTHER,
53 WINDOW_TYPE_BROWSER, 53 WINDOW_TYPE_BROWSER,
54 WINDOW_TYPE_HOSTED_APP, 54 WINDOW_TYPE_HOSTED_APP,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 // views::WidgetObserver overrides: 137 // views::WidgetObserver overrides:
138 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 138 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
139 virtual void OnWidgetActivationChanged(views::Widget* widget, 139 virtual void OnWidgetActivationChanged(views::Widget* widget,
140 bool active) OVERRIDE; 140 bool active) OVERRIDE;
141 141
142 // gfx::AnimationDelegate overrides: 142 // gfx::AnimationDelegate overrides:
143 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 143 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
144 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 144 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
145 145
146 // views::corewm::TransientWindowObserver overrides: 146 // ::wm::TransientWindowObserver overrides:
147 virtual void OnTransientChildAdded(aura::Window* window, 147 virtual void OnTransientChildAdded(aura::Window* window,
148 aura::Window* transient) OVERRIDE; 148 aura::Window* transient) OVERRIDE;
149 virtual void OnTransientChildRemoved(aura::Window* window, 149 virtual void OnTransientChildRemoved(aura::Window* window,
150 aura::Window* transient) OVERRIDE; 150 aura::Window* transient) OVERRIDE;
151 151
152 // ash::ImmersiveRevealedLock::Delegate overrides: 152 // ash::ImmersiveRevealedLock::Delegate overrides:
153 virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE; 153 virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE;
154 virtual void UnlockRevealedState() OVERRIDE; 154 virtual void UnlockRevealedState() OVERRIDE;
155 155
156 private: 156 private:
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 scoped_ptr<BubbleManager> bubble_manager_; 290 scoped_ptr<BubbleManager> bubble_manager_;
291 291
292 base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_; 292 base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_;
293 293
294 DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController); 294 DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController);
295 }; 295 };
296 296
297 } // namespace ash 297 } // namespace ash
298 298
299 #endif // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_ 299 #endif // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/drag_window_resizer_unittest.cc ('k') | ash/wm/immersive_fullscreen_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698