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

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

Issue 1483083003: Set the window state consistently Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/wm/window_util.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 #include "ash/root_window_controller.h" 6 #include "ash/root_window_controller.h"
7 #include "ash/screen_util.h" 7 #include "ash/screen_util.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 22 matching lines...) Expand all
33 public: 33 public:
34 explicit LoginTestWidgetDelegate(views::Widget* widget) : widget_(widget) { 34 explicit LoginTestWidgetDelegate(views::Widget* widget) : widget_(widget) {
35 } 35 }
36 ~LoginTestWidgetDelegate() override {} 36 ~LoginTestWidgetDelegate() override {}
37 37
38 // Overridden from WidgetDelegate: 38 // Overridden from WidgetDelegate:
39 void DeleteDelegate() override { delete this; } 39 void DeleteDelegate() override { delete this; }
40 views::Widget* GetWidget() override { return widget_; } 40 views::Widget* GetWidget() override { return widget_; }
41 const views::Widget* GetWidget() const override { return widget_; } 41 const views::Widget* GetWidget() const override { return widget_; }
42 bool CanActivate() const override { return true; } 42 bool CanActivate() const override { return true; }
43 bool CanMaximize() const override { return true; }
43 bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; } 44 bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; }
44 45
45 private: 46 private:
46 views::Widget* widget_; 47 views::Widget* widget_;
47 48
48 DISALLOW_COPY_AND_ASSIGN(LoginTestWidgetDelegate); 49 DISALLOW_COPY_AND_ASSIGN(LoginTestWidgetDelegate);
49 }; 50 };
50 51
51 } // namespace 52 } // namespace
52 53
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); 293 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get());
293 window->SetBounds(work_area); 294 window->SetBounds(work_area);
294 // Usually work_area takes Shelf into account but that doesn't affect 295 // Usually work_area takes Shelf into account but that doesn't affect
295 // LockScreen container windows. 296 // LockScreen container windows.
296 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); 297 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString());
297 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); 298 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
298 } 299 }
299 300
300 } // namespace test 301 } // namespace test
301 } // namespace ash 302 } // namespace ash
OLDNEW
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698