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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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/partial_screenshot_view.cc ('k') | ash/wm/session_state_animator.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) 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/screen_dimmer.h" 5 #include "ash/wm/screen_dimmer.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 dimmer_->SetDimming(true); 64 dimmer_->SetDimming(true);
65 ui::Layer* dimming_layer = test_api_->layer(); 65 ui::Layer* dimming_layer = test_api_->layer();
66 ASSERT_TRUE(dimming_layer != NULL); 66 ASSERT_TRUE(dimming_layer != NULL);
67 ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer(); 67 ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer();
68 EXPECT_EQ(gfx::Rect(root_layer->bounds().size()).ToString(), 68 EXPECT_EQ(gfx::Rect(root_layer->bounds().size()).ToString(),
69 dimming_layer->bounds().ToString()); 69 dimming_layer->bounds().ToString());
70 70
71 // When we resize the root window, the dimming layer should be resized to 71 // When we resize the root window, the dimming layer should be resized to
72 // match. 72 // match.
73 gfx::Size kNewSize(400, 300); 73 gfx::Size kNewSize(400, 300);
74 Shell::GetPrimaryRootWindow()->SetHostSize(kNewSize); 74 Shell::GetPrimaryRootWindow()->GetDispatcher()->SetHostSize(kNewSize);
75 EXPECT_EQ(kNewSize.ToString(), dimming_layer->bounds().size().ToString()); 75 EXPECT_EQ(kNewSize.ToString(), dimming_layer->bounds().size().ToString());
76 } 76 }
77 77
78 } // namespace test 78 } // namespace test
79 } // namespace ash 79 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/partial_screenshot_view.cc ('k') | ash/wm/session_state_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698