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

Side by Side Diff: trunk/src/ash/test/test_shell_delegate.cc

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/caps_lock_delegate_stub.h" 9 #include "ash/caps_lock_delegate_stub.h"
10 #include "ash/default_accessibility_delegate.h" 10 #include "ash/default_accessibility_delegate.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { 131 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() {
132 return new NewWindowDelegateImpl; 132 return new NewWindowDelegateImpl;
133 } 133 }
134 134
135 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { 135 MediaDelegate* TestShellDelegate::CreateMediaDelegate() {
136 return new MediaDelegateImpl; 136 return new MediaDelegateImpl;
137 } 137 }
138 138
139 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() {
140 return NULL;
141 }
142
139 ui::MenuModel* TestShellDelegate::CreateContextMenu( 143 ui::MenuModel* TestShellDelegate::CreateContextMenu(
140 aura::Window* root, 144 aura::Window* root,
141 ash::ShelfItemDelegate* item_delegate, 145 ash::ShelfItemDelegate* item_delegate,
142 ash::ShelfItem* item) { 146 ash::ShelfItem* item) {
143 return NULL; 147 return NULL;
144 } 148 }
145 149
146 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { 150 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() {
147 return WindowTreeHostFactory::Create(); 151 return WindowTreeHostFactory::Create();
148 } 152 }
149 153
150 GPUSupport* TestShellDelegate::CreateGPUSupport() { 154 GPUSupport* TestShellDelegate::CreateGPUSupport() {
151 // Real GPU support depends on src/content, so just use a stub. 155 // Real GPU support depends on src/content, so just use a stub.
152 return new GPUSupportStub; 156 return new GPUSupportStub;
153 } 157 }
154 158
155 base::string16 TestShellDelegate::GetProductName() const { 159 base::string16 TestShellDelegate::GetProductName() const {
156 return base::string16(); 160 return base::string16();
157 } 161 }
158 162
159 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 163 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
160 return test_session_state_delegate_; 164 return test_session_state_delegate_;
161 } 165 }
162 166
163 } // namespace test 167 } // namespace test
164 } // namespace ash 168 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/test/test_shell_delegate.h ('k') | trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698