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

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

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 1 month 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 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 const IPC::Message& message) override; 115 const IPC::Message& message) override;
116 const GURL& GetMainFrameLastCommittedURL() const override; 116 const GURL& GetMainFrameLastCommittedURL() const override;
117 void RenderViewTerminated(RenderViewHost* render_view_host, 117 void RenderViewTerminated(RenderViewHost* render_view_host,
118 base::TerminationStatus status, 118 base::TerminationStatus status,
119 int error_code) override; 119 int error_code) override;
120 RendererPreferences GetRendererPrefs( 120 RendererPreferences GetRendererPrefs(
121 BrowserContext* browser_context) const override; 121 BrowserContext* browser_context) const override;
122 gfx::Rect GetRootWindowResizerRect() const override; 122 gfx::Rect GetRootWindowResizerRect() const override;
123 void CreateNewWindow( 123 void CreateNewWindow(
124 SiteInstance* source_site_instance, 124 SiteInstance* source_site_instance,
125 int route_id, 125 int32_t route_id,
126 int main_frame_route_id, 126 int32_t main_frame_route_id,
127 int32_t main_frame_widget_route_id,
127 const ViewHostMsg_CreateWindow_Params& params, 128 const ViewHostMsg_CreateWindow_Params& params,
128 SessionStorageNamespace* session_storage_namespace) override; 129 SessionStorageNamespace* session_storage_namespace) override;
129 void CreateNewWidget(int32 render_process_id, 130 void CreateNewWidget(int32 render_process_id,
130 int32 route_id, 131 int32 route_id,
131 blink::WebPopupType popup_type) override; 132 blink::WebPopupType popup_type) override;
132 void CreateNewFullscreenWidget(int32 render_process_id, 133 void CreateNewFullscreenWidget(int32 render_process_id,
133 int32 route_id) override; 134 int32 route_id) override;
134 void ShowCreatedWindow(int route_id, 135 void ShowCreatedWindow(int route_id,
135 WindowOpenDisposition disposition, 136 WindowOpenDisposition disposition,
136 const gfx::Rect& initial_rect, 137 const gfx::Rect& initial_rect,
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 291 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
291 292
292 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 293 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
293 294
294 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 295 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
295 }; 296 };
296 297
297 } // namespace content 298 } // namespace content
298 299
299 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 300 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698