OLD | NEW |
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_INTERSTITIAL_PAGE_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_ |
6 #define CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 virtual void UpdateTitle(RenderViewHost* render_view_host, | 106 virtual void UpdateTitle(RenderViewHost* render_view_host, |
107 int32 page_id, | 107 int32 page_id, |
108 const string16& title, | 108 const string16& title, |
109 base::i18n::TextDirection title_direction) OVERRIDE; | 109 base::i18n::TextDirection title_direction) OVERRIDE; |
110 virtual RendererPreferences GetRendererPrefs( | 110 virtual RendererPreferences GetRendererPrefs( |
111 BrowserContext* browser_context) const OVERRIDE; | 111 BrowserContext* browser_context) const OVERRIDE; |
112 virtual WebPreferences GetWebkitPrefs() OVERRIDE; | 112 virtual WebPreferences GetWebkitPrefs() OVERRIDE; |
113 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; | 113 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; |
114 virtual void CreateNewWindow( | 114 virtual void CreateNewWindow( |
115 int route_id, | 115 int route_id, |
| 116 int main_frame_route_id, |
116 const ViewHostMsg_CreateWindow_Params& params, | 117 const ViewHostMsg_CreateWindow_Params& params, |
117 SessionStorageNamespace* session_storage_namespace) OVERRIDE; | 118 SessionStorageNamespace* session_storage_namespace) OVERRIDE; |
118 virtual void CreateNewWidget(int route_id, | 119 virtual void CreateNewWidget(int route_id, |
119 WebKit::WebPopupType popup_type) OVERRIDE; | 120 WebKit::WebPopupType popup_type) OVERRIDE; |
120 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; | 121 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; |
121 virtual void ShowCreatedWindow(int route_id, | 122 virtual void ShowCreatedWindow(int route_id, |
122 WindowOpenDisposition disposition, | 123 WindowOpenDisposition disposition, |
123 const gfx::Rect& initial_pos, | 124 const gfx::Rect& initial_pos, |
124 bool user_gesture) OVERRIDE; | 125 bool user_gesture) OVERRIDE; |
125 virtual void ShowCreatedWidget(int route_id, | 126 virtual void ShowCreatedWidget(int route_id, |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 scoped_ptr<InterstitialPageDelegate> delegate_; | 241 scoped_ptr<InterstitialPageDelegate> delegate_; |
241 | 242 |
242 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; | 243 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; |
243 | 244 |
244 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); | 245 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); |
245 }; | 246 }; |
246 | 247 |
247 } // namespace content | 248 } // namespace content |
248 | 249 |
249 #endif // CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_ | 250 #endif // CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_ |
OLD | NEW |