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

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

Issue 266053003: Remove page IDs from three WebContentsObserver APIs that don't need it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with Avi's change Created 6 years, 7 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 const base::string16& default_prompt, 350 const base::string16& default_prompt,
351 const GURL& frame_url, 351 const GURL& frame_url,
352 JavaScriptMessageType type, 352 JavaScriptMessageType type,
353 IPC::Message* reply_msg) OVERRIDE; 353 IPC::Message* reply_msg) OVERRIDE;
354 virtual void RunBeforeUnloadConfirm(RenderFrameHost* render_frame_host, 354 virtual void RunBeforeUnloadConfirm(RenderFrameHost* render_frame_host,
355 const base::string16& message, 355 const base::string16& message,
356 bool is_reload, 356 bool is_reload,
357 IPC::Message* reply_msg) OVERRIDE; 357 IPC::Message* reply_msg) OVERRIDE;
358 virtual void DidAccessInitialDocument() OVERRIDE; 358 virtual void DidAccessInitialDocument() OVERRIDE;
359 virtual void DidDisownOpener(RenderFrameHost* render_frame_host) OVERRIDE; 359 virtual void DidDisownOpener(RenderFrameHost* render_frame_host) OVERRIDE;
360 virtual void DocumentOnLoadCompleted(RenderFrameHost* render_frame_host, 360 virtual void DocumentOnLoadCompleted(
361 int32 page_id) OVERRIDE; 361 RenderFrameHost* render_frame_host) OVERRIDE;
362 virtual WebContents* GetAsWebContents() OVERRIDE; 362 virtual WebContents* GetAsWebContents() OVERRIDE;
363 virtual bool IsNeverVisible() OVERRIDE; 363 virtual bool IsNeverVisible() OVERRIDE;
364 364
365 // RenderViewHostDelegate ---------------------------------------------------- 365 // RenderViewHostDelegate ----------------------------------------------------
366 virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE; 366 virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
367 virtual bool OnMessageReceived(RenderViewHost* render_view_host, 367 virtual bool OnMessageReceived(RenderViewHost* render_view_host,
368 const IPC::Message& message) OVERRIDE; 368 const IPC::Message& message) OVERRIDE;
369 // RenderFrameHostDelegate has the same method, so list it there because this 369 // RenderFrameHostDelegate has the same method, so list it there because this
370 // interface is going away. 370 // interface is going away.
371 // virtual WebContents* GetAsWebContents() OVERRIDE; 371 // virtual WebContents* GetAsWebContents() OVERRIDE;
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 const base::ListValue& args); 756 const base::ListValue& args);
757 void OnRequestPpapiBrokerPermission(int routing_id, 757 void OnRequestPpapiBrokerPermission(int routing_id,
758 const GURL& url, 758 const GURL& url,
759 const base::FilePath& plugin_path); 759 const base::FilePath& plugin_path);
760 void OnBrowserPluginMessage(const IPC::Message& message); 760 void OnBrowserPluginMessage(const IPC::Message& message);
761 void OnDidDownloadImage(int id, 761 void OnDidDownloadImage(int id,
762 int http_status_code, 762 int http_status_code,
763 const GURL& image_url, 763 const GURL& image_url,
764 const std::vector<SkBitmap>& bitmaps, 764 const std::vector<SkBitmap>& bitmaps,
765 const std::vector<gfx::Size>& original_bitmap_sizes); 765 const std::vector<gfx::Size>& original_bitmap_sizes);
766 void OnUpdateFaviconURL(int32 page_id, 766 void OnUpdateFaviconURL(const std::vector<FaviconURL>& candidates);
767 const std::vector<FaviconURL>& candidates); 767 void OnFirstVisuallyNonEmptyPaint();
768 void OnFirstVisuallyNonEmptyPaint(int32 page_id);
769 void OnMediaPlayingNotification(int64 player_cookie, 768 void OnMediaPlayingNotification(int64 player_cookie,
770 bool has_video, 769 bool has_video,
771 bool has_audio); 770 bool has_audio);
772 void OnMediaPausedNotification(int64 player_cookie); 771 void OnMediaPausedNotification(int64 player_cookie);
773 void OnShowValidationMessage(const gfx::Rect& anchor_in_root_view, 772 void OnShowValidationMessage(const gfx::Rect& anchor_in_root_view,
774 const base::string16& main_text, 773 const base::string16& main_text,
775 const base::string16& sub_text); 774 const base::string16& sub_text);
776 void OnHideValidationMessage(); 775 void OnHideValidationMessage();
777 void OnMoveValidationMessage(const gfx::Rect& anchor_in_root_view); 776 void OnMoveValidationMessage(const gfx::Rect& anchor_in_root_view);
778 777
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 1112
1114 // Whether the last JavaScript dialog shown was suppressed. Used for testing. 1113 // Whether the last JavaScript dialog shown was suppressed. Used for testing.
1115 bool last_dialog_suppressed_; 1114 bool last_dialog_suppressed_;
1116 1115
1117 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1116 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1118 }; 1117 };
1119 1118
1120 } // namespace content 1119 } // namespace content
1121 1120
1122 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1121 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698