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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First cut for review/trybots Created 7 years, 2 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 void TestShellDelegate::HandleMediaNextTrack() { 136 void TestShellDelegate::HandleMediaNextTrack() {
137 } 137 }
138 138
139 void TestShellDelegate::HandleMediaPlayPause() { 139 void TestShellDelegate::HandleMediaPlayPause() {
140 } 140 }
141 141
142 void TestShellDelegate::HandleMediaPrevTrack() { 142 void TestShellDelegate::HandleMediaPrevTrack() {
143 } 143 }
144 144
145 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) { 145 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) {
146 return NULL; 146 return NULL;
147 } 147 }
148 148
149 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() { 149 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
150 // The ContextFactory must exist before any Compositors are created. 150 // The ContextFactory must exist before any Compositors are created.
151 bool allow_test_contexts = true; 151 bool allow_test_contexts = true;
152 ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts); 152 ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
153 153
154 return RootWindowHostFactory::Create(); 154 return RootWindowHostFactory::Create();
155 } 155 }
156 156
157 base::string16 TestShellDelegate::GetProductName() const { 157 base::string16 TestShellDelegate::GetProductName() const {
158 return base::string16(); 158 return base::string16();
159 } 159 }
160 160
161 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 161 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
162 return test_session_state_delegate_; 162 return test_session_state_delegate_;
163 } 163 }
164 164
165 } // namespace test 165 } // namespace test
166 } // namespace ash 166 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698