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

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

Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 return NULL; 139 return NULL;
140 } 140 }
141 141
142 void TestShellDelegate::RecordUserMetricsAction(UserMetricsAction action) { 142 void TestShellDelegate::RecordUserMetricsAction(UserMetricsAction action) {
143 } 143 }
144 144
145 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) { 145 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) {
146 return NULL; 146 return NULL;
147 } 147 }
148 148
149 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { 149 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
150 return WindowTreeHostFactory::Create(); 150 return RootWindowHostFactory::Create();
151 } 151 }
152 152
153 base::string16 TestShellDelegate::GetProductName() const { 153 base::string16 TestShellDelegate::GetProductName() const {
154 return base::string16(); 154 return base::string16();
155 } 155 }
156 156
157 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { 157 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
158 return test_session_state_delegate_; 158 return test_session_state_delegate_;
159 } 159 }
160 160
161 } // namespace test 161 } // namespace test
162 } // namespace ash 162 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/test/test_shell_delegate.h ('k') | trunk/src/ash/wm/caption_buttons/frame_maximize_button_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698