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

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

Issue 227573007: Third part of porting Chrome Ash to Windows 7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lf Created 6 years, 8 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
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/default_accessibility_delegate.h" 9 #include "ash/default_accessibility_delegate.h"
10 #include "ash/gpu_support_stub.h" 10 #include "ash/gpu_support_stub.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 143 }
144 144
145 ui::MenuModel* TestShellDelegate::CreateContextMenu( 145 ui::MenuModel* TestShellDelegate::CreateContextMenu(
146 aura::Window* root, 146 aura::Window* root,
147 ash::ShelfItemDelegate* item_delegate, 147 ash::ShelfItemDelegate* item_delegate,
148 ash::ShelfItem* item) { 148 ash::ShelfItem* item) {
149 return NULL; 149 return NULL;
150 } 150 }
151 151
152 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { 152 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() {
153 return WindowTreeHostFactory::Create(); 153 return WindowTreeHostFactory::CreateForTest();
154 } 154 }
155 155
156 GPUSupport* TestShellDelegate::CreateGPUSupport() { 156 GPUSupport* TestShellDelegate::CreateGPUSupport() {
157 // Real GPU support depends on src/content, so just use a stub. 157 // Real GPU support depends on src/content, so just use a stub.
158 return new GPUSupportStub; 158 return new GPUSupportStub;
159 } 159 }
160 160
161 base::string16 TestShellDelegate::GetProductName() const { 161 base::string16 TestShellDelegate::GetProductName() const {
162 return base::string16(); 162 return base::string16();
163 } 163 }
164 164
165 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 165 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
166 return test_session_state_delegate_; 166 return test_session_state_delegate_;
167 } 167 }
168 168
169 } // namespace test 169 } // namespace test
170 } // namespace ash 170 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698