| Index: ash/test/shell_test_api.h
|
| diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h
|
| index 12e40b785cb2498c409f1648849692a9b0918989..68c3749f4ddb273309983121aafbf007e6cbcb4a 100644
|
| --- a/ash/test/shell_test_api.h
|
| +++ b/ash/test/shell_test_api.h
|
| @@ -12,20 +12,17 @@ class InputMethodEventFilter;
|
| } // namespace wm
|
|
|
| namespace ash {
|
| -class AshNativeCursorManager;
|
| -class ShelfDelegate;
|
| -class ShelfModel;
|
| -class Shell;
|
| -
|
| -namespace internal {
|
| class AppListController;
|
| +class AshNativeCursorManager;
|
| class DragDropController;
|
| class MaximizeModeWindowManager;
|
| class RootWindowLayoutManager;
|
| class ScreenPositionController;
|
| +class ShelfDelegate;
|
| +class ShelfModel;
|
| +class Shell;
|
| class SystemGestureEventFilter;
|
| class WorkspaceController;
|
| -} // namespace internal
|
|
|
| namespace test {
|
|
|
| @@ -34,16 +31,16 @@ class ShellTestApi {
|
| public:
|
| explicit ShellTestApi(Shell* shell);
|
|
|
| - internal::RootWindowLayoutManager* root_window_layout();
|
| + RootWindowLayoutManager* root_window_layout();
|
| ::wm::InputMethodEventFilter* input_method_event_filter();
|
| - internal::SystemGestureEventFilter* system_gesture_event_filter();
|
| - internal::WorkspaceController* workspace_controller();
|
| - internal::ScreenPositionController* screen_position_controller();
|
| + SystemGestureEventFilter* system_gesture_event_filter();
|
| + WorkspaceController* workspace_controller();
|
| + ScreenPositionController* screen_position_controller();
|
| AshNativeCursorManager* ash_native_cursor_manager();
|
| ShelfModel* shelf_model();
|
| - internal::DragDropController* drag_drop_controller();
|
| - internal::AppListController* app_list_controller();
|
| - internal::MaximizeModeWindowManager* maximize_mode_window_manager();
|
| + DragDropController* drag_drop_controller();
|
| + AppListController* app_list_controller();
|
| + MaximizeModeWindowManager* maximize_mode_window_manager();
|
| void DisableOutputConfiguratorAnimation();
|
|
|
| // Set ShelfDelegate.
|
|
|