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

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: rebase Created 7 years, 1 month 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
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 void TestShellDelegate::HandleMediaNextTrack() { 131 void TestShellDelegate::HandleMediaNextTrack() {
132 } 132 }
133 133
134 void TestShellDelegate::HandleMediaPlayPause() { 134 void TestShellDelegate::HandleMediaPlayPause() {
135 } 135 }
136 136
137 void TestShellDelegate::HandleMediaPrevTrack() { 137 void TestShellDelegate::HandleMediaPrevTrack() {
138 } 138 }
139 139
140 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) { 140 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) {
141 return NULL; 141 return NULL;
142 } 142 }
143 143
144 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() { 144 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
145 // The ContextFactory must exist before any Compositors are created. 145 // The ContextFactory must exist before any Compositors are created.
146 bool allow_test_contexts = true; 146 bool allow_test_contexts = true;
147 ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts); 147 ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
148 148
149 return RootWindowHostFactory::Create(); 149 return RootWindowHostFactory::Create();
150 } 150 }
151 151
152 base::string16 TestShellDelegate::GetProductName() const { 152 base::string16 TestShellDelegate::GetProductName() const {
153 return base::string16(); 153 return base::string16();
154 } 154 }
155 155
156 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 156 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
157 return test_session_state_delegate_; 157 return test_session_state_delegate_;
158 } 158 }
159 159
160 } // namespace test 160 } // namespace test
161 } // namespace ash 161 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698