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

Side by Side Diff: content/browser/web_contents/web_contents_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_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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 WindowOpenDisposition disposition, 441 WindowOpenDisposition disposition,
442 const gfx::Rect& initial_pos, 442 const gfx::Rect& initial_pos,
443 bool user_gesture) OVERRIDE; 443 bool user_gesture) OVERRIDE;
444 virtual void ShowCreatedWidget(int route_id, 444 virtual void ShowCreatedWidget(int route_id,
445 const gfx::Rect& initial_pos) OVERRIDE; 445 const gfx::Rect& initial_pos) OVERRIDE;
446 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; 446 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
447 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; 447 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE;
448 virtual void RequestMediaAccessPermission( 448 virtual void RequestMediaAccessPermission(
449 const MediaStreamRequest& request, 449 const MediaStreamRequest& request,
450 const MediaResponseCallback& callback) OVERRIDE; 450 const MediaResponseCallback& callback) OVERRIDE;
451 virtual SessionStorageNamespace* GetSessionStorageNamespace() OVERRIDE;
451 452
452 // RenderWidgetHostDelegate -------------------------------------------------- 453 // RenderWidgetHostDelegate --------------------------------------------------
453 454
454 virtual void RenderWidgetDeleted( 455 virtual void RenderWidgetDeleted(
455 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 456 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
456 virtual bool PreHandleKeyboardEvent( 457 virtual bool PreHandleKeyboardEvent(
457 const NativeWebKeyboardEvent& event, 458 const NativeWebKeyboardEvent& event,
458 bool* is_keyboard_shortcut) OVERRIDE; 459 bool* is_keyboard_shortcut) OVERRIDE;
459 virtual void HandleKeyboardEvent( 460 virtual void HandleKeyboardEvent(
460 const NativeWebKeyboardEvent& event) OVERRIDE; 461 const NativeWebKeyboardEvent& event) OVERRIDE;
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 // Maps the ids of pending image downloads to their callbacks 943 // Maps the ids of pending image downloads to their callbacks
943 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; 944 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
944 ImageDownloadMap image_download_map_; 945 ImageDownloadMap image_download_map_;
945 946
946 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 947 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
947 }; 948 };
948 949
949 } // namespace content 950 } // namespace content
950 951
951 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 952 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698