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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.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
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 #include "content/browser/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 // as complete. Without this, navigating in a UI test to a URL that triggers 424 // as complete. Without this, navigating in a UI test to a URL that triggers
425 // an interstitial would hang. 425 // an interstitial would hang.
426 web_contents_was_loading_ = controller_->delegate()->IsLoading(); 426 web_contents_was_loading_ = controller_->delegate()->IsLoading();
427 controller_->delegate()->SetIsLoading( 427 controller_->delegate()->SetIsLoading(
428 controller_->delegate()->GetRenderViewHost(), false, NULL); 428 controller_->delegate()->GetRenderViewHost(), false, NULL);
429 } 429 }
430 430
431 void InterstitialPageImpl::UpdateTitle( 431 void InterstitialPageImpl::UpdateTitle(
432 RenderViewHost* render_view_host, 432 RenderViewHost* render_view_host,
433 int32 page_id, 433 int32 page_id,
434 const string16& title, 434 const base::string16& title,
435 base::i18n::TextDirection title_direction) { 435 base::i18n::TextDirection title_direction) {
436 if (!enabled()) 436 if (!enabled())
437 return; 437 return;
438 438
439 DCHECK(render_view_host == render_view_host_); 439 DCHECK(render_view_host == render_view_host_);
440 NavigationEntry* entry = controller_->GetVisibleEntry(); 440 NavigationEntry* entry = controller_->GetVisibleEntry();
441 if (!entry) { 441 if (!entry) {
442 // Crash reports from the field indicate this can be NULL. 442 // Crash reports from the field indicate this can be NULL.
443 // This is unexpected as InterstitialPages constructed with the 443 // This is unexpected as InterstitialPages constructed with the
444 // new_navigation flag set to true create a transient navigation entry 444 // new_navigation flag set to true create a transient navigation entry
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 WebContentsView* web_contents_view = web_contents()->GetView(); 538 WebContentsView* web_contents_view = web_contents()->GetView();
539 WebContentsViewPort* web_contents_view_port = 539 WebContentsViewPort* web_contents_view_port =
540 static_cast<WebContentsViewPort*>(web_contents_view); 540 static_cast<WebContentsViewPort*>(web_contents_view);
541 RenderWidgetHostView* view = 541 RenderWidgetHostView* view =
542 web_contents_view_port->CreateViewForWidget(render_view_host_); 542 web_contents_view_port->CreateViewForWidget(render_view_host_);
543 render_view_host_->SetView(view); 543 render_view_host_->SetView(view);
544 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); 544 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
545 545
546 int32 max_page_id = web_contents()-> 546 int32 max_page_id = web_contents()->
547 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 547 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
548 render_view_host_->CreateRenderView(string16(), 548 render_view_host_->CreateRenderView(base::string16(),
549 MSG_ROUTING_NONE, 549 MSG_ROUTING_NONE,
550 max_page_id); 550 max_page_id);
551 controller_->delegate()->RenderViewForInterstitialPageCreated( 551 controller_->delegate()->RenderViewForInterstitialPageCreated(
552 render_view_host_); 552 render_view_host_);
553 view->SetSize(web_contents_view->GetContainerSize()); 553 view->SetSize(web_contents_view->GetContainerSize());
554 // Don't show the interstitial until we have navigated to it. 554 // Don't show the interstitial until we have navigated to it.
555 view->Hide(); 555 view->Hide();
556 return web_contents_view; 556 return web_contents_view;
557 } 557 }
558 558
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 842
843 web_contents->GetDelegateView()->TakeFocus(reverse); 843 web_contents->GetDelegateView()->TakeFocus(reverse);
844 } 844 }
845 845
846 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 846 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
847 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 847 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
848 int active_match_ordinal, bool final_update) { 848 int active_match_ordinal, bool final_update) {
849 } 849 }
850 850
851 } // namespace content 851 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/interstitial_page_impl.h ('k') | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698