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

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

Issue 12225076: Delete most web intents code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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/renderer/web_intents_host_browsertest.cc ('k') | content/shell/webkit_test_runner.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 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
7 7
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/renderer/render_view_observer.h" 10 #include "content/public/renderer/render_view_observer.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h"
12 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Preferences.h" 11 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Preferences.h"
13 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestDelegate.h" 12 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestDelegate.h"
14 #include "v8/include/v8.h" 13 #include "v8/include/v8.h"
15 14
16 class SkCanvas; 15 class SkCanvas;
17 16
18 namespace WebKit { 17 namespace WebKit {
19 struct WebRect; 18 struct WebRect;
20 } 19 }
21 20
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 long long ms); 55 long long ms);
57 virtual WebKit::WebString registerIsolatedFileSystem( 56 virtual WebKit::WebString registerIsolatedFileSystem(
58 const WebKit::WebVector<WebKit::WebString>& absolute_filenames); 57 const WebKit::WebVector<WebKit::WebString>& absolute_filenames);
59 virtual long long getCurrentTimeInMillisecond(); 58 virtual long long getCurrentTimeInMillisecond();
60 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path( 59 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(
61 const std::string& utf8_path); 60 const std::string& utf8_path);
62 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL& file_url); 61 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL& file_url);
63 virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string& utf8_url); 62 virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string& utf8_url);
64 virtual ::WebTestRunner::WebPreferences* preferences(); 63 virtual ::WebTestRunner::WebPreferences* preferences();
65 virtual void applyPreferences(); 64 virtual void applyPreferences();
66 #if defined(ENABLE_WEB_INTENTS)
67 virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&);
68 virtual WebKit::WebIntentRequest* currentWebIntentRequest();
69 #endif
70 virtual std::string makeURLErrorDescription(const WebKit::WebURLError& error); 65 virtual std::string makeURLErrorDescription(const WebKit::WebURLError& error);
71 66
72 void Reset(); 67 void Reset();
73 void NotifyDone(); 68 void NotifyDone();
74 void DumpAsText(); 69 void DumpAsText();
75 void DumpChildFramesAsText(); 70 void DumpChildFramesAsText();
76 void WaitUntilDone(); 71 void WaitUntilDone();
77 void OverridePreference(const std::string& key, v8::Local<v8::Value> value); 72 void OverridePreference(const std::string& key, v8::Local<v8::Value> value);
78 73
79 void NotImplemented(const std::string& object, const std::string& method); 74 void NotImplemented(const std::string& object, const std::string& method);
(...skipping 13 matching lines...) Expand all
93 void DisplayRepaintMask(); 88 void DisplayRepaintMask();
94 89
95 scoped_ptr<SkCanvas> canvas_; 90 scoped_ptr<SkCanvas> canvas_;
96 scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_; 91 scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_;
97 base::FilePath current_working_directory_; 92 base::FilePath current_working_directory_;
98 93
99 ::WebTestRunner::WebTestProxyBase* proxy_; 94 ::WebTestRunner::WebTestProxyBase* proxy_;
100 95
101 ::WebTestRunner::WebPreferences prefs_; 96 ::WebTestRunner::WebPreferences prefs_;
102 97
103 #if defined(ENABLE_WEB_INTENTS)
104 WebKit::WebIntentRequest intent_request_;
105 #endif
106
107 bool dump_editing_callbacks_; 98 bool dump_editing_callbacks_;
108 bool dump_frame_load_callbacks_; 99 bool dump_frame_load_callbacks_;
109 bool dump_user_gesture_in_frame_load_callbacks_; 100 bool dump_user_gesture_in_frame_load_callbacks_;
110 bool stop_provisional_frame_loads_; 101 bool stop_provisional_frame_loads_;
111 bool dump_title_changes_; 102 bool dump_title_changes_;
112 bool dump_resource_load_callbacks_; 103 bool dump_resource_load_callbacks_;
113 bool dump_resource_request_callbacks_; 104 bool dump_resource_request_callbacks_;
114 bool dump_resource_response_mime_types_; 105 bool dump_resource_response_mime_types_;
115 bool dump_create_view_; 106 bool dump_create_view_;
116 bool can_open_windows_; 107 bool can_open_windows_;
117 108
118 bool test_is_running_; 109 bool test_is_running_;
119 bool wait_until_done_; 110 bool wait_until_done_;
120 bool load_finished_; 111 bool load_finished_;
121 112
122 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); 113 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
123 }; 114 };
124 115
125 } // namespace content 116 } // namespace content
126 117
127 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 118 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/renderer/web_intents_host_browsertest.cc ('k') | content/shell/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698