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

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

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 12 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/shelf_layout_manager.h" 5 #include "ash/wm/shelf_layout_manager.h"
6 6
7 #include "ash/launcher/launcher.h" 7 #include "ash/launcher/launcher.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
11 #include "ui/aura/screen_aura.h" 11 #include "ui/aura/screen_aura.h"
12 #include "ui/gfx/compositor/layer.h" 12 #include "ui/gfx/compositor/layer.h"
13 #include "ui/gfx/compositor/layer_animator.h" 13 #include "ui/gfx/compositor/layer_animator.h"
14 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
15 15
16 namespace aura_shell { 16 namespace ash {
17 namespace internal { 17 namespace internal {
18 18
19 namespace { 19 namespace {
20 20
21 ui::Layer* GetLayer(views::Widget* widget) { 21 ui::Layer* GetLayer(views::Widget* widget) {
22 return widget->GetNativeView()->layer(); 22 return widget->GetNativeView()->layer();
23 } 23 }
24 24
25 } // namespace 25 } // namespace
26 26
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 if (!animating_) 148 if (!animating_)
149 return; 149 return;
150 animating_ = false; 150 animating_ = false;
151 visible_ = !visible_; 151 visible_ = !visible_;
152 TargetBounds target_bounds; 152 TargetBounds target_bounds;
153 CalculateTargetBounds(visible_, &target_bounds); 153 CalculateTargetBounds(visible_, &target_bounds);
154 aura::RootWindow::GetInstance()->screen()->set_work_area_insets( 154 aura::RootWindow::GetInstance()->screen()->set_work_area_insets(
155 target_bounds.work_area_insets); 155 target_bounds.work_area_insets);
156 } 156 }
157 157
158 } // internal 158 } // namespace internal
159 } // aura_shell 159 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698