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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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_alignment_menu.cc ('k') | ash/shelf/shelf_layout_manager_observer.h » ('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_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 virtual void OnDockBoundsChanging( 335 virtual void OnDockBoundsChanging(
336 const gfx::Rect& dock_bounds, 336 const gfx::Rect& dock_bounds,
337 DockedWindowLayoutManagerObserver::Reason reason) OVERRIDE; 337 DockedWindowLayoutManagerObserver::Reason reason) OVERRIDE;
338 338
339 // Generates insets for inward edge based on the current shelf alignment. 339 // Generates insets for inward edge based on the current shelf alignment.
340 gfx::Insets GetInsetsForAlignment(int distance) const; 340 gfx::Insets GetInsetsForAlignment(int distance) const;
341 341
342 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from 342 // The RootWindow is cached so that we don't invoke Shell::GetInstance() from
343 // our destructor. We avoid that as at the time we're deleted Shell is being 343 // our destructor. We avoid that as at the time we're deleted Shell is being
344 // deleted too. 344 // deleted too.
345 aura::RootWindow* root_window_; 345 aura::Window* root_window_;
346 346
347 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling 347 // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
348 // UpdateBoundsAndOpacity() again from SetChildBounds(). 348 // UpdateBoundsAndOpacity() again from SetChildBounds().
349 bool updating_bounds_; 349 bool updating_bounds_;
350 350
351 // See description above setter. 351 // See description above setter.
352 ShelfAutoHideBehavior auto_hide_behavior_; 352 ShelfAutoHideBehavior auto_hide_behavior_;
353 353
354 // See description above getter. 354 // See description above getter.
355 ShelfAlignment alignment_; 355 ShelfAlignment alignment_;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 // The bounds of the dock. 407 // The bounds of the dock.
408 gfx::Rect dock_bounds_; 408 gfx::Rect dock_bounds_;
409 409
410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
411 }; 411 };
412 412
413 } // namespace internal 413 } // namespace internal
414 } // namespace ash 414 } // namespace ash
415 415
416 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 416 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_alignment_menu.cc ('k') | ash/shelf/shelf_layout_manager_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698