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

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

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 | « no previous file | content/browser/tab_contents/interstitial_page.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) 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 #ifndef CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 int error_code) OVERRIDE; 124 int error_code) OVERRIDE;
125 virtual void DidNavigate( 125 virtual void DidNavigate(
126 RenderViewHost* render_view_host, 126 RenderViewHost* render_view_host,
127 const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; 127 const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
128 virtual void UpdateTitle(RenderViewHost* render_view_host, 128 virtual void UpdateTitle(RenderViewHost* render_view_host,
129 int32 page_id, 129 int32 page_id,
130 const string16& title, 130 const string16& title,
131 base::i18n::TextDirection title_direction) OVERRIDE; 131 base::i18n::TextDirection title_direction) OVERRIDE;
132 virtual content::RendererPreferences GetRendererPrefs( 132 virtual content::RendererPreferences GetRendererPrefs(
133 content::BrowserContext* browser_context) const OVERRIDE; 133 content::BrowserContext* browser_context) const OVERRIDE;
134 virtual WebPreferences GetWebkitPrefs() OVERRIDE;
134 135
135 // Invoked with the NavigationEntry that is going to be added to the 136 // Invoked with the NavigationEntry that is going to be added to the
136 // navigation controller. 137 // navigation controller.
137 // Gives an opportunity to sub-classes to set states on the |entry|. 138 // Gives an opportunity to sub-classes to set states on the |entry|.
138 // Note that this is only called if the InterstitialPage was constructed with 139 // Note that this is only called if the InterstitialPage was constructed with
139 // |create_navigation_entry| set to true. 140 // |create_navigation_entry| set to true.
140 virtual void UpdateEntry(NavigationEntry* entry) {} 141 virtual void UpdateEntry(NavigationEntry* entry) {}
141 142
142 bool enabled() const { return enabled_; } 143 bool enabled() const { return enabled_; }
143 TabContents* tab() const { return tab_; } 144 TabContents* tab() const { return tab_; }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap; 239 typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap;
239 static InterstitialPageMap* tab_to_interstitial_page_; 240 static InterstitialPageMap* tab_to_interstitial_page_;
240 241
241 // Settings passed to the renderer. 242 // Settings passed to the renderer.
242 content::RendererPreferences renderer_preferences_; 243 content::RendererPreferences renderer_preferences_;
243 244
244 DISALLOW_COPY_AND_ASSIGN(InterstitialPage); 245 DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
245 }; 246 };
246 247
247 #endif // CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 248 #endif // CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/tab_contents/interstitial_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698