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

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

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix wallpaper tests again Created 4 years, 5 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/shelf_test_api.h ('k') | ash/test/shell_test_api.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 #ifndef ASH_TEST_SHELL_TEST_API_H_ 5 #ifndef ASH_TEST_SHELL_TEST_API_H_
6 #define ASH_TEST_SHELL_TEST_API_H_ 6 #define ASH_TEST_SHELL_TEST_API_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace app_list { 10 namespace app_list {
(...skipping 22 matching lines...) Expand all
33 SystemGestureEventFilter* system_gesture_event_filter(); 33 SystemGestureEventFilter* system_gesture_event_filter();
34 WorkspaceController* workspace_controller(); 34 WorkspaceController* workspace_controller();
35 ScreenPositionController* screen_position_controller(); 35 ScreenPositionController* screen_position_controller();
36 AshNativeCursorManager* ash_native_cursor_manager(); 36 AshNativeCursorManager* ash_native_cursor_manager();
37 ShelfModel* shelf_model(); 37 ShelfModel* shelf_model();
38 DragDropController* drag_drop_controller(); 38 DragDropController* drag_drop_controller();
39 app_list::AppListPresenter* app_list_presenter(); 39 app_list::AppListPresenter* app_list_presenter();
40 MaximizeModeWindowManager* maximize_mode_window_manager(); 40 MaximizeModeWindowManager* maximize_mode_window_manager();
41 void DisableDisplayAnimator(); 41 void DisableDisplayAnimator();
42 42
43 // Set ShelfDelegate.
44 void SetShelfDelegate(ShelfDelegate* delegate);
45
46 // Set SessionStateDelegate. 43 // Set SessionStateDelegate.
47 void SetSessionStateDelegate(SessionStateDelegate* session_state_delegate); 44 void SetSessionStateDelegate(SessionStateDelegate* session_state_delegate);
48 45
49 private: 46 private:
50 Shell* shell_; // not owned 47 Shell* shell_; // not owned
51 48
52 DISALLOW_COPY_AND_ASSIGN(ShellTestApi); 49 DISALLOW_COPY_AND_ASSIGN(ShellTestApi);
53 }; 50 };
54 51
55 } // namespace test 52 } // namespace test
56 } // namespace ash 53 } // namespace ash
57 54
58 #endif // ASH_TEST_SHELL_TEST_API_H_ 55 #endif // ASH_TEST_SHELL_TEST_API_H_
OLDNEW
« no previous file with comments | « ash/test/shelf_test_api.h ('k') | ash/test/shell_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698