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

Side by Side Diff: content/browser/tab_contents/interstitial_page.cc

Issue 8826013: Respect command line flags for interstitial pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove logic to explicitly disallow compositing Created 9 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/browser/tab_contents/interstitial_page.h ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tab_contents/interstitial_page.h" 5 #include "content/browser/tab_contents/interstitial_page.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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 // http://code.google.com/p/chromium/issues/detail?id=27094 386 // http://code.google.com/p/chromium/issues/detail?id=27094
387 entry->set_title(title); 387 entry->set_title(title);
388 tab_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TITLE); 388 tab_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TITLE);
389 } 389 }
390 390
391 content::RendererPreferences InterstitialPage::GetRendererPrefs( 391 content::RendererPreferences InterstitialPage::GetRendererPrefs(
392 content::BrowserContext* browser_context) const { 392 content::BrowserContext* browser_context) const {
393 return renderer_preferences_; 393 return renderer_preferences_;
394 } 394 }
395 395
396 WebPreferences InterstitialPage::GetWebkitPrefs() {
397 return content::GetContentClient()->browser()->GetWebkitPrefs(
398 render_view_host());
399 }
400
396 RenderViewHost* InterstitialPage::CreateRenderViewHost() { 401 RenderViewHost* InterstitialPage::CreateRenderViewHost() {
397 RenderViewHost* render_view_host = new RenderViewHost( 402 RenderViewHost* render_view_host = new RenderViewHost(
398 SiteInstance::CreateSiteInstance(tab()->browser_context()), 403 SiteInstance::CreateSiteInstance(tab()->browser_context()),
399 this, MSG_ROUTING_NONE, kInvalidSessionStorageNamespaceId); 404 this, MSG_ROUTING_NONE, kInvalidSessionStorageNamespaceId);
400 return render_view_host; 405 return render_view_host;
401 } 406 }
402 407
403 TabContentsView* InterstitialPage::CreateTabContentsView() { 408 TabContentsView* InterstitialPage::CreateTabContentsView() {
404 TabContentsView* tab_contents_view = tab()->view(); 409 TabContentsView* tab_contents_view = tab()->view();
405 RenderWidgetHostView* view = 410 RenderWidgetHostView* view =
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 void InterstitialPage::InterstitialPageRVHViewDelegate::TakeFocus( 651 void InterstitialPage::InterstitialPageRVHViewDelegate::TakeFocus(
647 bool reverse) { 652 bool reverse) {
648 if (interstitial_page_->tab() && interstitial_page_->tab()->GetViewDelegate()) 653 if (interstitial_page_->tab() && interstitial_page_->tab()->GetViewDelegate())
649 interstitial_page_->tab()->GetViewDelegate()->TakeFocus(reverse); 654 interstitial_page_->tab()->GetViewDelegate()->TakeFocus(reverse);
650 } 655 }
651 656
652 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( 657 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
653 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 658 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
654 int active_match_ordinal, bool final_update) { 659 int active_match_ordinal, bool final_update) {
655 } 660 }
OLDNEW
« no previous file with comments | « content/browser/tab_contents/interstitial_page.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698