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

Unified Diff: ui/aura_shell/desktop_layout_manager.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura_shell/desktop_layout_manager.h ('k') | ui/aura_shell/shelf_layout_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/desktop_layout_manager.cc
===================================================================
--- ui/aura_shell/desktop_layout_manager.cc (revision 113185)
+++ ui/aura_shell/desktop_layout_manager.cc (working copy)
@@ -5,6 +5,7 @@
#include "ui/aura_shell/desktop_layout_manager.h"
#include "ui/aura/window.h"
+#include "ui/aura_shell/shelf_layout_controller.h"
#include "ui/views/widget/widget.h"
namespace aura_shell {
@@ -15,7 +16,8 @@
DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner)
: owner_(owner),
- background_widget_(NULL) {
+ background_widget_(NULL),
+ shelf_(NULL) {
}
DesktopLayoutManager::~DesktopLayoutManager() {
@@ -33,6 +35,9 @@
(*i)->SetBounds(fullscreen_bounds);
background_widget_->SetBounds(fullscreen_bounds);
+
+ if (shelf_)
+ shelf_->LayoutShelf();
}
void DesktopLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
@@ -50,5 +55,6 @@
SetChildBoundsDirect(child, requested_bounds);
}
+
} // namespace internal
} // namespace aura_shell
« no previous file with comments | « ui/aura_shell/desktop_layout_manager.h ('k') | ui/aura_shell/shelf_layout_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698