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

Side by Side Diff: ui/aura_shell/shelf_layout_controller.cc

Issue 8817016: Revert 113185 - [cros, Aura] Refresh status area widget bounds on StatusAreaView layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | « ui/aura_shell/shelf_layout_controller.h ('k') | ui/aura_shell/shelf_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 "ui/aura_shell/shelf_layout_controller.h" 5 #include "ui/aura_shell/shelf_layout_controller.h"
6 6
7 #include "ui/aura/desktop.h" 7 #include "ui/aura/desktop.h"
8 #include "ui/aura/screen_aura.h" 8 #include "ui/aura/screen_aura.h"
9 #include "ui/gfx/compositor/layer.h" 9 #include "ui/gfx/compositor/layer.h"
10 #include "ui/gfx/compositor/layer_animator.h" 10 #include "ui/gfx/compositor/layer_animator.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 animating_ = false; 110 animating_ = false;
111 visible_ = !visible_; 111 visible_ = !visible_;
112 TargetBounds target_bounds; 112 TargetBounds target_bounds;
113 CalculateTargetBounds(visible_, &target_bounds); 113 CalculateTargetBounds(visible_, &target_bounds);
114 aura::Desktop::GetInstance()->screen()->set_work_area_insets( 114 aura::Desktop::GetInstance()->screen()->set_work_area_insets(
115 target_bounds.work_area_insets); 115 target_bounds.work_area_insets);
116 } 116 }
117 117
118 } // internal 118 } // internal
119 } // aura_shell 119 } // aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/shelf_layout_controller.h ('k') | ui/aura_shell/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698