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

Side by Side Diff: ash/test/shell_test_api.cc

Issue 1861013004: AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl
Patch Set: Rebase. Created 4 years, 8 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
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_shell_delegate.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 (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/test/shell_test_api.h" 5 #include "ash/test/shell_test_api.h"
6 6
7 #include "ash/display/display_configuration_controller.h" 7 #include "ash/display/display_configuration_controller.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shelf/shelf_delegate.h" 10 #include "ash/shelf/shelf_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_delegate.h"
12 13
13 namespace ash { 14 namespace ash {
14 namespace test { 15 namespace test {
15 16
16 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 17 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
17 18
18 RootWindowLayoutManager* ShellTestApi::root_window_layout() { 19 RootWindowLayoutManager* ShellTestApi::root_window_layout() {
19 return shell_->GetPrimaryRootWindowController()->root_window_layout(); 20 return shell_->GetPrimaryRootWindowController()->root_window_layout();
20 } 21 }
21 22
(...skipping 14 matching lines...) Expand all
36 } 37 }
37 38
38 ShelfModel* ShellTestApi::shelf_model() { 39 ShelfModel* ShellTestApi::shelf_model() {
39 return shell_->shelf_model_.get(); 40 return shell_->shelf_model_.get();
40 } 41 }
41 42
42 DragDropController* ShellTestApi::drag_drop_controller() { 43 DragDropController* ShellTestApi::drag_drop_controller() {
43 return shell_->drag_drop_controller_.get(); 44 return shell_->drag_drop_controller_.get();
44 } 45 }
45 46
46 AppListController* ShellTestApi::app_list_controller() { 47 app_list::AppListShower* ShellTestApi::app_list_shower() {
47 return shell_->app_list_controller_.get(); 48 return shell_->delegate_->GetAppListShower();
48 } 49 }
49 50
50 void ShellTestApi::DisableDisplayAnimator() { 51 void ShellTestApi::DisableDisplayAnimator() {
51 shell_->display_configuration_controller()->ResetAnimatorForTest(); 52 shell_->display_configuration_controller()->ResetAnimatorForTest();
52 } 53 }
53 54
54 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { 55 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
55 shell_->shelf_delegate_.reset(delegate); 56 shell_->shelf_delegate_.reset(delegate);
56 } 57 }
57 58
58 void ShellTestApi::SetSessionStateDelegate( 59 void ShellTestApi::SetSessionStateDelegate(
59 SessionStateDelegate* session_state_delegate) { 60 SessionStateDelegate* session_state_delegate) {
60 shell_->session_state_delegate_.reset(session_state_delegate); 61 shell_->session_state_delegate_.reset(session_state_delegate);
61 } 62 }
62 63
63 } // namespace test 64 } // namespace test
64 } // namespace ash 65 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698