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

Side by Side Diff: content/shell/renderer/test_runner/test_interfaces.cc

Issue 1133753003: Split gamepad provider from test runner controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/shell/renderer/test_runner/test_interfaces.h" 5 #include "content/shell/renderer/test_runner/test_interfaces.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/json/string_escape.h" 11 #include "base/json/string_escape.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/values.h"
14 #include "content/shell/common/shell_switches.h" 15 #include "content/shell/common/shell_switches.h"
15 #include "content/shell/renderer/test_runner/accessibility_controller.h" 16 #include "content/shell/renderer/test_runner/accessibility_controller.h"
16 #include "content/shell/renderer/test_runner/event_sender.h" 17 #include "content/shell/renderer/test_runner/event_sender.h"
17 #include "content/shell/renderer/test_runner/gamepad_controller.h" 18 #include "content/shell/renderer/test_runner/gamepad_controller.h"
18 #include "content/shell/renderer/test_runner/test_runner.h" 19 #include "content/shell/renderer/test_runner/test_runner.h"
19 #include "content/shell/renderer/test_runner/text_input_controller.h" 20 #include "content/shell/renderer/test_runner/text_input_controller.h"
20 #include "content/shell/renderer/test_runner/web_test_proxy.h" 21 #include "content/shell/renderer/test_runner/web_test_proxy.h"
21 #include "third_party/WebKit/public/platform/WebURL.h" 22 #include "third_party/WebKit/public/platform/WebURL.h"
22 #include "third_party/WebKit/public/web/WebCache.h" 23 #include "third_party/WebKit/public/web/WebCache.h"
23 #include "third_party/WebKit/public/web/WebKit.h" 24 #include "third_party/WebKit/public/web/WebKit.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 175
175 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() { 176 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() {
176 if (!test_runner_->UseMockTheme()) 177 if (!test_runner_->UseMockTheme())
177 return 0; 178 return 0;
178 if (!theme_engine_.get()) 179 if (!theme_engine_.get())
179 theme_engine_.reset(new MockWebThemeEngine()); 180 theme_engine_.reset(new MockWebThemeEngine());
180 return theme_engine_.get(); 181 return theme_engine_.get();
181 } 182 }
182 183
183 } // namespace content 184 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/gamepad_controller.cc ('k') | content/shell/renderer/test_runner/web_test_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698