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

Side by Side Diff: content/shell/webkit_test_controller.h

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new location for public/platform Created 7 years, 6 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
« no previous file with comments | « content/shell/shell_content_browser_client.cc ('k') | content/test/test_web_contents.h » ('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 #ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
7 7
8 #include <ostream> 8 #include <ostream>
9 #include <string> 9 #include <string>
10 10
11 #include "base/cancelable_callback.h" 11 #include "base/cancelable_callback.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "base/threading/non_thread_safe.h" 14 #include "base/threading/non_thread_safe.h"
15 #include "content/public/browser/gpu_data_manager_observer.h" 15 #include "content/public/browser/gpu_data_manager_observer.h"
16 #include "content/public/browser/notification_observer.h" 16 #include "content/public/browser/notification_observer.h"
17 #include "content/public/browser/notification_registrar.h" 17 #include "content/public/browser/notification_registrar.h"
18 #include "content/public/browser/render_view_host_observer.h" 18 #include "content/public/browser/render_view_host_observer.h"
19 #include "content/public/browser/web_contents_observer.h" 19 #include "content/public/browser/web_contents_observer.h"
20 #include "ui/gfx/size.h" 20 #include "ui/gfx/size.h"
21 #include "webkit/glue/webpreferences.h" 21 #include "webkit/common/webpreferences.h"
22 22
23 class SkBitmap; 23 class SkBitmap;
24 24
25 namespace content { 25 namespace content {
26 26
27 class Shell; 27 class Shell;
28 28
29 class WebKitTestResultPrinter { 29 class WebKitTestResultPrinter {
30 public: 30 public:
31 WebKitTestResultPrinter(std::ostream* output, std::ostream* error); 31 WebKitTestResultPrinter(std::ostream* output, std::ostream* error);
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 base::CancelableClosure watchdog_; 182 base::CancelableClosure watchdog_;
183 183
184 NotificationRegistrar registrar_; 184 NotificationRegistrar registrar_;
185 185
186 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); 186 DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
187 }; 187 };
188 188
189 } // namespace content 189 } // namespace content
190 190
191 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ 191 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.cc ('k') | content/test/test_web_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698