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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize 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/wm/lock_layout_manager.h ('k') | ash/wm/lock_state_controller.h » ('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"
11 #include "ash/wm/window_state.h" 11 #include "ash/wm/window_state.h"
12 #include "base/basictypes.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "ui/aura/client/aura_constants.h" 13 #include "ui/aura/client/aura_constants.h"
15 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
16 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
17 #include "ui/keyboard/keyboard_controller.h" 16 #include "ui/keyboard/keyboard_controller.h"
18 #include "ui/keyboard/keyboard_switches.h" 17 #include "ui/keyboard/keyboard_switches.h"
19 #include "ui/keyboard/keyboard_ui.h" 18 #include "ui/keyboard/keyboard_ui.h"
20 #include "ui/keyboard/keyboard_util.h" 19 #include "ui/keyboard/keyboard_util.h"
21 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
22 #include "ui/views/widget/widget_delegate.h" 21 #include "ui/views/widget/widget_delegate.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); 291 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get());
293 window->SetBounds(work_area); 292 window->SetBounds(work_area);
294 // Usually work_area takes Shelf into account but that doesn't affect 293 // Usually work_area takes Shelf into account but that doesn't affect
295 // LockScreen container windows. 294 // LockScreen container windows.
296 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); 295 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString());
297 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); 296 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
298 } 297 }
299 298
300 } // namespace test 299 } // namespace test
301 } // namespace ash 300 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/lock_layout_manager.h ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698