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

Side by Side Diff: ash/common/shelf/shelf_layout_manager.h

Issue 2295003002: mash: Remove WmRootWindowControllerObserver. (Closed)
Patch Set: Address comments. Created 4 years, 3 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/aura/wm_root_window_controller_aura.cc ('k') | ash/common/shelf/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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 bool IsHorizontalAlignment() const; 179 bool IsHorizontalAlignment() const;
180 180
181 // Returns how the shelf background is painted. 181 // Returns how the shelf background is painted.
182 ShelfBackgroundType GetShelfBackgroundType() const; 182 ShelfBackgroundType GetShelfBackgroundType() const;
183 183
184 // Set the height of the ChromeVox panel, which takes away space from the 184 // Set the height of the ChromeVox panel, which takes away space from the
185 // available work area from the top of the screen. 185 // available work area from the top of the screen.
186 void SetChromeVoxPanelHeight(int height); 186 void SetChromeVoxPanelHeight(int height);
187 187
188 private: 188 private:
189 class RootWindowControllerObserverImpl;
190 class UpdateShelfObserver; 189 class UpdateShelfObserver;
191 friend class PanelLayoutManagerTest; 190 friend class PanelLayoutManagerTest;
192 friend class ShelfLayoutManagerTest; 191 friend class ShelfLayoutManagerTest;
193 192
194 struct TargetBounds { 193 struct TargetBounds {
195 TargetBounds(); 194 TargetBounds();
196 ~TargetBounds(); 195 ~TargetBounds();
197 196
198 float opacity; 197 float opacity;
199 float status_opacity; 198 float status_opacity;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // needs to be removed from the available work area. 364 // needs to be removed from the available work area.
366 int chromevox_panel_height_; 365 int chromevox_panel_height_;
367 366
368 // The show hide animation duration override or 0 for default. 367 // The show hide animation duration override or 0 for default.
369 int duration_override_in_ms_; 368 int duration_override_in_ms_;
370 369
371 // The flag to enforce invisible shelf (as in MD-experiemntal). 370 // The flag to enforce invisible shelf (as in MD-experiemntal).
372 // TODO(oshima): Remove this when MD immersive is launched. 371 // TODO(oshima): Remove this when MD immersive is launched.
373 bool invisible_auto_hide_shelf_ = false; 372 bool invisible_auto_hide_shelf_ = false;
374 373
375 std::unique_ptr<RootWindowControllerObserverImpl>
376 root_window_controller_observer_;
377
378 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 374 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
379 }; 375 };
380 376
381 } // namespace ash 377 } // namespace ash
382 378
383 #endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_ 379 #endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698