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

Side by Side Diff: content/test/test_web_contents.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/test/test_web_contents.h ('k') | content/test/test_web_contents_view.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 #include "content/test/test_web_contents.h" 5 #include "content/test/test_web_contents.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/browser/browser_url_handler_impl.h" 9 #include "content/browser/browser_url_handler_impl.h"
10 #include "content/browser/frame_host/navigation_entry_impl.h" 10 #include "content/browser/frame_host/navigation_entry_impl.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 } 87 }
88 88
89 WebPreferences TestWebContents::TestGetWebkitPrefs() { 89 WebPreferences TestWebContents::TestGetWebkitPrefs() {
90 return GetWebkitPrefs(); 90 return GetWebkitPrefs();
91 } 91 }
92 92
93 bool TestWebContents::CreateRenderViewForRenderManager( 93 bool TestWebContents::CreateRenderViewForRenderManager(
94 RenderViewHost* render_view_host, int opener_route_id) { 94 RenderViewHost* render_view_host, int opener_route_id) {
95 // This will go to a TestRenderViewHost. 95 // This will go to a TestRenderViewHost.
96 static_cast<RenderViewHostImpl*>( 96 static_cast<RenderViewHostImpl*>(
97 render_view_host)->CreateRenderView(string16(), 97 render_view_host)->CreateRenderView(base::string16(),
98 opener_route_id, 98 opener_route_id,
99 -1); 99 -1);
100 return true; 100 return true;
101 } 101 }
102 102
103 WebContents* TestWebContents::Clone() { 103 WebContents* TestWebContents::Clone() {
104 WebContentsImpl* contents = 104 WebContentsImpl* contents =
105 Create(GetBrowserContext(), SiteInstance::Create(GetBrowserContext())); 105 Create(GetBrowserContext(), SiteInstance::Create(GetBrowserContext()));
106 contents->GetController().CopyStateFrom(controller_); 106 contents->GetController().CopyStateFrom(controller_);
107 return contents; 107 return contents;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 bool is_main_frame) { 205 bool is_main_frame) {
206 ViewHostMsg_DidFinishLoad msg(0, frame_id, url, is_main_frame); 206 ViewHostMsg_DidFinishLoad msg(0, frame_id, url, is_main_frame);
207 OnMessageReceived(GetRenderViewHost(), msg); 207 OnMessageReceived(GetRenderViewHost(), msg);
208 } 208 }
209 209
210 void TestWebContents::TestDidFailLoadWithError( 210 void TestWebContents::TestDidFailLoadWithError(
211 int64 frame_id, 211 int64 frame_id,
212 const GURL& url, 212 const GURL& url,
213 bool is_main_frame, 213 bool is_main_frame,
214 int error_code, 214 int error_code,
215 const string16& error_description) { 215 const base::string16& error_description) {
216 ViewHostMsg_DidFailLoadWithError msg( 216 ViewHostMsg_DidFailLoadWithError msg(
217 0, frame_id, url, is_main_frame, error_code, error_description); 217 0, frame_id, url, is_main_frame, error_code, error_description);
218 OnMessageReceived(GetRenderViewHost(), msg); 218 OnMessageReceived(GetRenderViewHost(), msg);
219 } 219 }
220 220
221 void TestWebContents::CreateNewWindow( 221 void TestWebContents::CreateNewWindow(
222 int route_id, 222 int route_id,
223 int main_frame_route_id, 223 int main_frame_route_id,
224 const ViewHostMsg_CreateWindow_Params& params, 224 const ViewHostMsg_CreateWindow_Params& params,
225 SessionStorageNamespace* session_storage_namespace) { 225 SessionStorageNamespace* session_storage_namespace) {
(...skipping 13 matching lines...) Expand all
239 } 239 }
240 240
241 void TestWebContents::ShowCreatedWidget(int route_id, 241 void TestWebContents::ShowCreatedWidget(int route_id,
242 const gfx::Rect& initial_pos) { 242 const gfx::Rect& initial_pos) {
243 } 243 }
244 244
245 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { 245 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
246 } 246 }
247 247
248 } // namespace content 248 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_web_contents.h ('k') | content/test/test_web_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698