| 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/media_delegate.h" |
| 10 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
| 11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 13 | 14 |
| 14 namespace keyboard { | 15 namespace keyboard { |
| 15 class KeyboardControllerProxy; | 16 class KeyboardControllerProxy; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace ash { | 19 namespace ash { |
| 19 namespace test { | 20 namespace test { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; | 57 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; |
| 57 virtual ui::MenuModel* CreateContextMenu( | 58 virtual ui::MenuModel* CreateContextMenu( |
| 58 aura::Window* root, | 59 aura::Window* root, |
| 59 ash::ShelfItemDelegate* item_delegate, | 60 ash::ShelfItemDelegate* item_delegate, |
| 60 ash::ShelfItem* item) OVERRIDE; | 61 ash::ShelfItem* item) OVERRIDE; |
| 61 virtual GPUSupport* CreateGPUSupport() OVERRIDE; | 62 virtual GPUSupport* CreateGPUSupport() OVERRIDE; |
| 62 virtual base::string16 GetProductName() const OVERRIDE; | 63 virtual base::string16 GetProductName() const OVERRIDE; |
| 63 | 64 |
| 64 int num_exit_requests() const { return num_exit_requests_; } | 65 int num_exit_requests() const { return num_exit_requests_; } |
| 65 | 66 |
| 66 TestSessionStateDelegate* test_session_state_delegate(); | 67 TestSessionStateDelegate* test_session_state_delegate() { |
| 68 return test_session_state_delegate_; |
| 69 } |
| 70 |
| 71 void SetMediaCaptureState(MediaCaptureState state); |
| 67 | 72 |
| 68 private: | 73 private: |
| 69 int num_exit_requests_; | 74 int num_exit_requests_; |
| 70 bool multi_profiles_enabled_; | 75 bool multi_profiles_enabled_; |
| 71 | 76 |
| 72 scoped_ptr<content::BrowserContext> active_browser_context_; | 77 scoped_ptr<content::BrowserContext> active_browser_context_; |
| 73 | 78 |
| 74 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. | 79 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. |
| 75 | 80 |
| 76 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 81 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
| 77 }; | 82 }; |
| 78 | 83 |
| 79 } // namespace test | 84 } // namespace test |
| 80 } // namespace ash | 85 } // namespace ash |
| 81 | 86 |
| 82 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 87 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
| OLD | NEW |