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

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

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view Created 6 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_BROWSER_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/web_contents_observer.h" 18 #include "content/public/browser/web_contents_observer.h"
19 #include "content/public/common/web_preferences.h"
19 #include "content/shell/common/leak_detection_result.h" 20 #include "content/shell/common/leak_detection_result.h"
20 #include "ui/gfx/size.h" 21 #include "ui/gfx/size.h"
21 #include "webkit/common/webpreferences.h"
22 22
23 #if defined(OS_ANDROID) 23 #if defined(OS_ANDROID)
24 #include "base/threading/thread_restrictions.h" 24 #include "base/threading/thread_restrictions.h"
25 #endif 25 #endif
26 26
27 class SkBitmap; 27 class SkBitmap;
28 28
29 namespace content { 29 namespace content {
30 30
31 class Shell; 31 class Shell;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // waiting on the UI thread while layout tests are being ran. 218 // waiting on the UI thread while layout tests are being ran.
219 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 219 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
220 #endif 220 #endif
221 221
222 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); 222 DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
223 }; 223 };
224 224
225 } // namespace content 225 } // namespace content
226 226
227 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 227 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_content_browser_client.cc ('k') | content/shell/common/shell_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698