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

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

Issue 18500005: Fix SessionStorage confusion between RenderViewHostImpl and NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: code review Created 7 years, 5 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_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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 WebKit::WebPopupType popup_type) OVERRIDE; 122 WebKit::WebPopupType popup_type) OVERRIDE;
123 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; 123 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE;
124 virtual void ShowCreatedWindow(int route_id, 124 virtual void ShowCreatedWindow(int route_id,
125 WindowOpenDisposition disposition, 125 WindowOpenDisposition disposition,
126 const gfx::Rect& initial_pos, 126 const gfx::Rect& initial_pos,
127 bool user_gesture) OVERRIDE; 127 bool user_gesture) OVERRIDE;
128 virtual void ShowCreatedWidget(int route_id, 128 virtual void ShowCreatedWidget(int route_id,
129 const gfx::Rect& initial_pos) OVERRIDE; 129 const gfx::Rect& initial_pos) OVERRIDE;
130 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; 130 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
131 131
132 virtual SessionStorageNamespace* GetSessionStorageNamespace() OVERRIDE;
133
132 // RenderWidgetHostDelegate implementation: 134 // RenderWidgetHostDelegate implementation:
133 virtual void RenderWidgetDeleted( 135 virtual void RenderWidgetDeleted(
134 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 136 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
135 virtual bool PreHandleKeyboardEvent( 137 virtual bool PreHandleKeyboardEvent(
136 const NativeWebKeyboardEvent& event, 138 const NativeWebKeyboardEvent& event,
137 bool* is_keyboard_shortcut) OVERRIDE; 139 bool* is_keyboard_shortcut) OVERRIDE;
138 virtual void HandleKeyboardEvent( 140 virtual void HandleKeyboardEvent(
139 const NativeWebKeyboardEvent& event) OVERRIDE; 141 const NativeWebKeyboardEvent& event) OVERRIDE;
140 #if defined(OS_WIN) && defined(USE_AURA) 142 #if defined(OS_WIN) && defined(USE_AURA)
141 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; 143 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 236
235 // Settings passed to the renderer. 237 // Settings passed to the renderer.
236 mutable RendererPreferences renderer_preferences_; 238 mutable RendererPreferences renderer_preferences_;
237 239
238 bool create_view_; 240 bool create_view_;
239 241
240 scoped_ptr<InterstitialPageDelegate> delegate_; 242 scoped_ptr<InterstitialPageDelegate> delegate_;
241 243
242 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 244 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
243 245
246 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
247
244 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 248 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
245 }; 249 };
246 250
247 } // namespace content 251 } // namespace content
248 252
249 #endif // CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_ 253 #endif // CONTENT_BROWSER_WEB_CONTENTS_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698