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

Side by Side Diff: ash/shelf/shelf_window_watcher.h

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/shelf_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 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
7 7
8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h" 8 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 11 matching lines...) Expand all
22 class ActivationClient; 22 class ActivationClient;
23 } 23 }
24 24
25 } // namespace aura 25 } // namespace aura
26 26
27 namespace ash { 27 namespace ash {
28 28
29 class ShelfModel; 29 class ShelfModel;
30 class ShelfItemDelegateManager; 30 class ShelfItemDelegateManager;
31 31
32 namespace internal {
33 // ShelfWindowWatcher creates and handles a ShelfItem for windows that have 32 // ShelfWindowWatcher creates and handles a ShelfItem for windows that have
34 // a ShelfItemDetails property in the default container. 33 // a ShelfItemDetails property in the default container.
35 class ShelfWindowWatcher : public aura::client::ActivationChangeObserver, 34 class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
36 public aura::WindowObserver, 35 public aura::WindowObserver,
37 public gfx::DisplayObserver { 36 public gfx::DisplayObserver {
38 public: 37 public:
39 ShelfWindowWatcher(ShelfModel* model, 38 ShelfWindowWatcher(ShelfModel* model,
40 ShelfItemDelegateManager* item_delegate_manager); 39 ShelfItemDelegateManager* item_delegate_manager);
41 virtual ~ShelfWindowWatcher(); 40 virtual ~ShelfWindowWatcher();
42 41
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Holds removed windows that has an item from default container. 136 // Holds removed windows that has an item from default container.
138 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_; 137 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_;
139 138
140 // Holds all observed activation clients. 139 // Holds all observed activation clients.
141 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, 140 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
142 aura::client::ActivationChangeObserver> observed_activation_clients_; 141 aura::client::ActivationChangeObserver> observed_activation_clients_;
143 142
144 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); 143 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
145 }; 144 };
146 145
147 } // namespace internal
148 } // namespace ash 146 } // namespace ash
149 147
150 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 148 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698