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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 10383292: Get rid of the need of ViewType::VIEW_TYPE_INTERSTITIAL_PAGE in content. There are no ViewType valu… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // The callbacks can be inside of this function, or at some future time. 105 // The callbacks can be inside of this function, or at some future time.
106 // 106 //
107 // The entry has a PageID of -1 if newly created (corresponding to navigation 107 // The entry has a PageID of -1 if newly created (corresponding to navigation
108 // to a new URL). 108 // to a new URL).
109 // 109 //
110 // If this method returns false, then the navigation is discarded (equivalent 110 // If this method returns false, then the navigation is discarded (equivalent
111 // to calling DiscardPendingEntry on the NavigationController). 111 // to calling DiscardPendingEntry on the NavigationController).
112 bool NavigateToPendingEntry( 112 bool NavigateToPendingEntry(
113 content::NavigationController::ReloadType reload_type); 113 content::NavigationController::ReloadType reload_type);
114 114
115 // Called by InterstitialPageImpl when it creates a RenderViewHost.
116 void RenderViewForInterstitialPageCreated(
117 content::RenderViewHost* render_view_host);
118
115 // Sets the passed passed interstitial as the currently showing interstitial. 119 // Sets the passed passed interstitial as the currently showing interstitial.
116 // |interstitial_page| should be non NULL (use the remove_interstitial_page 120 // |interstitial_page| should be non NULL (use the remove_interstitial_page
117 // method to unset the interstitial) and no interstitial page should be set 121 // method to unset the interstitial) and no interstitial page should be set
118 // when there is already a non NULL interstitial page set. 122 // when there is already a non NULL interstitial page set.
119 void set_interstitial_page(InterstitialPageImpl* interstitial_page) { 123 void set_interstitial_page(InterstitialPageImpl* interstitial_page) {
120 render_manager_.set_interstitial_page(interstitial_page); 124 render_manager_.set_interstitial_page(interstitial_page);
121 } 125 }
122 126
123 // Unsets the currently showing interstitial. 127 // Unsets the currently showing interstitial.
124 void remove_interstitial_page() { 128 void remove_interstitial_page() {
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 // Type of view this WebContents is displaying. 726 // Type of view this WebContents is displaying.
723 content::ViewType view_type_; 727 content::ViewType view_type_;
724 728
725 // Color chooser that was opened by this tab. 729 // Color chooser that was opened by this tab.
726 content::ColorChooser* color_chooser_; 730 content::ColorChooser* color_chooser_;
727 731
728 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 732 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
729 }; 733 };
730 734
731 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 735 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/interstitial_page_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698