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

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

Issue 10837185: Clean-up inline members of nested classes (ash/) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | ash/wm/shelf_layout_manager.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 ASH_WM_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/launcher/launcher.h" 9 #include "ash/launcher/launcher.h"
10 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 virtual void OnWindowActivated(aura::Window* active, 161 virtual void OnWindowActivated(aura::Window* active,
162 aura::Window* old_active) OVERRIDE; 162 aura::Window* old_active) OVERRIDE;
163 163
164 private: 164 private:
165 class AutoHideEventFilter; 165 class AutoHideEventFilter;
166 friend class ash::ScreenAsh; 166 friend class ash::ScreenAsh;
167 friend class ShelfLayoutManagerTest; 167 friend class ShelfLayoutManagerTest;
168 FRIEND_TEST_ALL_PREFIXES(ShelfLayoutManagerTest, SetAutoHideBehavior); 168 FRIEND_TEST_ALL_PREFIXES(ShelfLayoutManagerTest, SetAutoHideBehavior);
169 169
170 struct TargetBounds { 170 struct TargetBounds {
171 TargetBounds() : opacity(0.0f) {} 171 TargetBounds();
172 172
173 float opacity; 173 float opacity;
174 gfx::Rect launcher_bounds_in_root; 174 gfx::Rect launcher_bounds_in_root;
175 gfx::Rect status_bounds_in_root; 175 gfx::Rect status_bounds_in_root;
176 gfx::Insets work_area_insets; 176 gfx::Insets work_area_insets;
177 }; 177 };
178 178
179 struct State { 179 struct State {
180 State() : visibility_state(VISIBLE), 180 State() : visibility_state(VISIBLE),
181 auto_hide_state(AUTO_HIDE_HIDDEN), 181 auto_hide_state(AUTO_HIDE_HIDDEN),
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 ObserverList<Observer> observers_; 275 ObserverList<Observer> observers_;
276 276
277 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 277 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
278 }; 278 };
279 279
280 } // namespace internal 280 } // namespace internal
281 } // namespace ash 281 } // namespace ash
282 282
283 #endif // ASH_WM_SHELF_LAYOUT_MANAGER_H_ 283 #endif // ASH_WM_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698