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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 1258273006: Remove page id from title and state updating. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch
Patch Set: comment nit Created 4 years, 2 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
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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 void InterstitialPageImpl::RenderFrameCreated( 374 void InterstitialPageImpl::RenderFrameCreated(
375 RenderFrameHost* render_frame_host) { 375 RenderFrameHost* render_frame_host) {
376 // Note this is only for subframes in the interstitial, the notification for 376 // Note this is only for subframes in the interstitial, the notification for
377 // the main frame happens in RenderViewCreated. 377 // the main frame happens in RenderViewCreated.
378 controller_->delegate()->RenderFrameForInterstitialPageCreated( 378 controller_->delegate()->RenderFrameForInterstitialPageCreated(
379 render_frame_host); 379 render_frame_host);
380 } 380 }
381 381
382 void InterstitialPageImpl::UpdateTitle( 382 void InterstitialPageImpl::UpdateTitle(
383 RenderFrameHost* render_frame_host, 383 RenderFrameHost* render_frame_host,
384 int32_t page_id,
385 const base::string16& title, 384 const base::string16& title,
386 base::i18n::TextDirection title_direction) { 385 base::i18n::TextDirection title_direction) {
387 if (!enabled()) 386 if (!enabled())
388 return; 387 return;
389 388
390 RenderViewHost* render_view_host = render_frame_host->GetRenderViewHost(); 389 RenderViewHost* render_view_host = render_frame_host->GetRenderViewHost();
391 DCHECK(render_view_host == render_view_host_); 390 DCHECK(render_view_host == render_view_host_);
392 NavigationEntry* entry = controller_->GetVisibleEntry(); 391 NavigationEntry* entry = controller_->GetVisibleEntry();
393 if (!entry) { 392 if (!entry) {
394 // There may be no visible entry if no URL has committed (e.g., after 393 // There may be no visible entry if no URL has committed (e.g., after
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 void InterstitialPageImpl::UpdateDeviceScaleFactor(double device_scale_factor) { 956 void InterstitialPageImpl::UpdateDeviceScaleFactor(double device_scale_factor) {
958 WebContentsImpl* web_contents_impl = 957 WebContentsImpl* web_contents_impl =
959 static_cast<WebContentsImpl*>(web_contents_); 958 static_cast<WebContentsImpl*>(web_contents_);
960 if (!web_contents_impl) 959 if (!web_contents_impl)
961 return; 960 return;
962 961
963 web_contents_impl->UpdateDeviceScaleFactor(device_scale_factor); 962 web_contents_impl->UpdateDeviceScaleFactor(device_scale_factor);
964 } 963 }
965 964
966 } // namespace content 965 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/interstitial_page_impl.h ('k') | content/browser/frame_host/render_frame_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698