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

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

Issue 19491004: Fix SessionStorage confusion between RenderViewHostImpl and NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 WindowOpenDisposition disposition, 444 WindowOpenDisposition disposition,
445 const gfx::Rect& initial_pos, 445 const gfx::Rect& initial_pos,
446 bool user_gesture) OVERRIDE; 446 bool user_gesture) OVERRIDE;
447 virtual void ShowCreatedWidget(int route_id, 447 virtual void ShowCreatedWidget(int route_id,
448 const gfx::Rect& initial_pos) OVERRIDE; 448 const gfx::Rect& initial_pos) OVERRIDE;
449 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; 449 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
450 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; 450 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE;
451 virtual void RequestMediaAccessPermission( 451 virtual void RequestMediaAccessPermission(
452 const MediaStreamRequest& request, 452 const MediaStreamRequest& request,
453 const MediaResponseCallback& callback) OVERRIDE; 453 const MediaResponseCallback& callback) OVERRIDE;
454 virtual SessionStorageNamespace* GetSessionStorageNamespace(
455 SiteInstance* instance) OVERRIDE;
454 456
455 // RenderWidgetHostDelegate -------------------------------------------------- 457 // RenderWidgetHostDelegate --------------------------------------------------
456 458
457 virtual void RenderWidgetDeleted( 459 virtual void RenderWidgetDeleted(
458 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 460 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
459 virtual bool PreHandleKeyboardEvent( 461 virtual bool PreHandleKeyboardEvent(
460 const NativeWebKeyboardEvent& event, 462 const NativeWebKeyboardEvent& event,
461 bool* is_keyboard_shortcut) OVERRIDE; 463 bool* is_keyboard_shortcut) OVERRIDE;
462 virtual void HandleKeyboardEvent( 464 virtual void HandleKeyboardEvent(
463 const NativeWebKeyboardEvent& event) OVERRIDE; 465 const NativeWebKeyboardEvent& event) OVERRIDE;
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 // Maps the ids of pending image downloads to their callbacks 954 // Maps the ids of pending image downloads to their callbacks
953 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; 955 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
954 ImageDownloadMap image_download_map_; 956 ImageDownloadMap image_download_map_;
955 957
956 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 958 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
957 }; 959 };
958 960
959 } // namespace content 961 } // namespace content
960 962
961 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 963 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/render_view_host_manager.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