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

Side by Side Diff: ash/wm/status_area_layout_manager.cc

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/wm/status_area_layout_manager.h ('k') | ash/wm/system_background_controller.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 #include "ash/wm/status_area_layout_manager.h" 5 #include "ash/wm/status_area_layout_manager.h"
6 6
7 #include "ash/shelf/shelf_layout_manager.h" 7 #include "ash/shelf/shelf_layout_manager.h"
8 #include "ash/shelf/shelf_widget.h" 8 #include "ash/shelf/shelf_widget.h"
9 #include "ash/system/status_area_widget.h" 9 #include "ash/system/status_area_widget.h"
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace internal {
16 15
17 //////////////////////////////////////////////////////////////////////////////// 16 ////////////////////////////////////////////////////////////////////////////////
18 // StatusAreaLayoutManager, public: 17 // StatusAreaLayoutManager, public:
19 18
20 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf) 19 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf)
21 : in_layout_(false), 20 : in_layout_(false),
22 shelf_(shelf) { 21 shelf_(shelf) {
23 } 22 }
24 23
25 StatusAreaLayoutManager::~StatusAreaLayoutManager() { 24 StatusAreaLayoutManager::~StatusAreaLayoutManager() {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 69
71 void StatusAreaLayoutManager::LayoutStatusArea() { 70 void StatusAreaLayoutManager::LayoutStatusArea() {
72 // Shelf layout manager may be already doing layout. 71 // Shelf layout manager may be already doing layout.
73 if (shelf_->shelf_layout_manager()->updating_bounds()) 72 if (shelf_->shelf_layout_manager()->updating_bounds())
74 return; 73 return;
75 74
76 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); 75 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
77 shelf_->shelf_layout_manager()->LayoutShelf(); 76 shelf_->shelf_layout_manager()->LayoutShelf();
78 } 77 }
79 78
80 } // namespace internal
81 } // namespace ash 79 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/status_area_layout_manager.h ('k') | ash/wm/system_background_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698