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

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

Issue 7980023: Fixes aura unit tests. There were a couple of problems: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « ui/aura/window_unittest.cc ('k') | ui/aura_shell/desktop_window.cc » ('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) 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/desktop_layout_manager.h" 5 #include "ui/aura_shell/desktop_layout_manager.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "views/widget/widget.h" 8 #include "views/widget/widget.h"
9 9
10 namespace aura_shell { 10 namespace aura_shell {
11 namespace internal { 11 namespace internal {
12 12
13 //////////////////////////////////////////////////////////////////////////////// 13 ////////////////////////////////////////////////////////////////////////////////
14 // DesktopLayoutManager, public: 14 // DesktopLayoutManager, public:
15 15
16 DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner) 16 DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner)
17 : owner_(owner), 17 : owner_(owner),
18 toplevel_window_container_(NULL),
18 background_widget_(NULL), 19 background_widget_(NULL),
19 launcher_widget_(NULL), 20 launcher_widget_(NULL),
20 status_area_widget_(NULL) { 21 status_area_widget_(NULL) {
21 } 22 }
22 23
23 DesktopLayoutManager::~DesktopLayoutManager() { 24 DesktopLayoutManager::~DesktopLayoutManager() {
24 } 25 }
25 26
26 //////////////////////////////////////////////////////////////////////////////// 27 ////////////////////////////////////////////////////////////////////////////////
27 // DesktopLayoutManager, aura::LayoutManager implementation: 28 // DesktopLayoutManager, aura::LayoutManager implementation:
(...skipping 15 matching lines...) Expand all
43 gfx::Rect status_area_bounds = status_area_widget_->GetWindowScreenBounds(); 44 gfx::Rect status_area_bounds = status_area_widget_->GetWindowScreenBounds();
44 status_area_widget_->SetBounds( 45 status_area_widget_->SetBounds(
45 gfx::Rect(owner_->bounds().right() - status_area_bounds.width(), 46 gfx::Rect(owner_->bounds().right() - status_area_bounds.width(),
46 0, 47 0,
47 status_area_bounds.width(), 48 status_area_bounds.width(),
48 status_area_bounds.height())); 49 status_area_bounds.height()));
49 } 50 }
50 51
51 } // namespace internal 52 } // namespace internal
52 } // namespace aura_shell 53 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/aura_shell/desktop_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698