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

Side by Side Diff: ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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
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/workspace/workspace_layout_manager.h" 5 #include "ash/wm/workspace/workspace_layout_manager.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
11 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
12 #include "ash/session/session_state_delegate.h" 12 #include "ash/session/session_state_delegate.h"
13 #include "ash/shelf/shelf.h"
13 #include "ash/shelf/shelf_constants.h" 14 #include "ash/shelf/shelf_constants.h"
14 #include "ash/shelf/shelf_layout_manager.h" 15 #include "ash/shelf/shelf_layout_manager.h"
15 #include "ash/shelf/wm_shelf.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/shell_observer.h" 17 #include "ash/shell_observer.h"
18 #include "ash/shell_port.h" 18 #include "ash/shell_port.h"
19 #include "ash/test/ash_test_base.h" 19 #include "ash/test/ash_test_base.h"
20 #include "ash/wm/fullscreen_window_finder.h" 20 #include "ash/wm/fullscreen_window_finder.h"
21 #include "ash/wm/window_state.h" 21 #include "ash/wm/window_state.h"
22 #include "ash/wm/window_util.h" 22 #include "ash/wm/window_util.h"
23 #include "ash/wm/wm_event.h" 23 #include "ash/wm/wm_event.h"
24 #include "ash/wm/workspace/workspace_window_resizer.h" 24 #include "ash/wm/workspace/workspace_window_resizer.h"
25 #include "ash/wm_window.h" 25 #include "ash/wm_window.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 changed_window_bounds.Offset(0, -shift); 195 changed_window_bounds.Offset(0, -shift);
196 // Window should be shifted up. 196 // Window should be shifted up.
197 EXPECT_EQ(changed_window_bounds, window->bounds()); 197 EXPECT_EQ(changed_window_bounds, window->bounds());
198 198
199 kb_controller->HideKeyboard( 199 kb_controller->HideKeyboard(
200 keyboard::KeyboardController::HIDE_REASON_AUTOMATIC); 200 keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
201 EXPECT_EQ(orig_window_bounds, window->bounds()); 201 EXPECT_EQ(orig_window_bounds, window->bounds());
202 } 202 }
203 203
204 } // namespace ash 204 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698