OLD | NEW |
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_TEST_SHELL_DELEGATE_H_ | 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_ |
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ | 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; | 43 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; |
44 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; | 44 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; |
45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; | 45 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; |
46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; | 46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; |
47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; | 47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; |
48 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; | 48 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; |
49 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; | 49 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; |
50 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; | 50 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; |
51 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; | 51 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; |
52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; | 52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; |
53 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE; | 53 virtual ui::MenuModel* CreateContextMenu( |
| 54 aura::Window* root, |
| 55 ash::ShelfItemDelegate* item_delegate, |
| 56 ash::LauncherItem* item) OVERRIDE; |
54 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; | 57 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; |
55 virtual base::string16 GetProductName() const OVERRIDE; | 58 virtual base::string16 GetProductName() const OVERRIDE; |
56 | 59 |
57 int num_exit_requests() const { return num_exit_requests_; } | 60 int num_exit_requests() const { return num_exit_requests_; } |
58 | 61 |
59 TestSessionStateDelegate* test_session_state_delegate(); | 62 TestSessionStateDelegate* test_session_state_delegate(); |
60 | 63 |
61 private: | 64 private: |
62 int num_exit_requests_; | 65 int num_exit_requests_; |
63 bool multi_profiles_enabled_; | 66 bool multi_profiles_enabled_; |
64 | 67 |
65 scoped_ptr<content::BrowserContext> active_browser_context_; | 68 scoped_ptr<content::BrowserContext> active_browser_context_; |
66 | 69 |
67 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. | 70 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. |
68 | 71 |
69 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 72 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
70 }; | 73 }; |
71 | 74 |
72 } // namespace test | 75 } // namespace test |
73 } // namespace ash | 76 } // namespace ash |
74 | 77 |
75 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 78 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
OLD | NEW |