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

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

Issue 11820009: Distinguish plugin disconnections from plugin crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "base/process.h"
16 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" 17 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"
17 #include "content/browser/renderer_host/render_view_host_delegate.h" 18 #include "content/browser/renderer_host/render_view_host_delegate.h"
18 #include "content/browser/renderer_host/render_widget_host_delegate.h" 19 #include "content/browser/renderer_host/render_widget_host_delegate.h"
19 #include "content/browser/web_contents/navigation_controller_impl.h" 20 #include "content/browser/web_contents/navigation_controller_impl.h"
20 #include "content/browser/web_contents/render_view_host_manager.h" 21 #include "content/browser/web_contents/render_view_host_manager.h"
21 #include "content/common/content_export.h" 22 #include "content/common/content_export.h"
22 #include "content/public/browser/notification_observer.h" 23 #include "content/public/browser/notification_observer.h"
23 #include "content/public/browser/notification_registrar.h" 24 #include "content/public/browser/notification_registrar.h"
24 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
25 #include "content/public/common/renderer_preferences.h" 26 #include "content/public/common/renderer_preferences.h"
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 void OnFindReply(int request_id, 539 void OnFindReply(int request_id,
539 int number_of_matches, 540 int number_of_matches,
540 const gfx::Rect& selection_rect, 541 const gfx::Rect& selection_rect,
541 int active_match_ordinal, 542 int active_match_ordinal,
542 bool final_update); 543 bool final_update);
543 #if defined(OS_ANDROID) 544 #if defined(OS_ANDROID)
544 void OnFindMatchRectsReply(int version, 545 void OnFindMatchRectsReply(int version,
545 const std::vector<gfx::RectF>& rects, 546 const std::vector<gfx::RectF>& rects,
546 const gfx::RectF& active_rect); 547 const gfx::RectF& active_rect);
547 #endif 548 #endif
548 void OnCrashedPlugin(const FilePath& plugin_path); 549 void OnCrashedPlugin(const FilePath& plugin_path, base::ProcessId plugin_pid);
549 void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy); 550 void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy);
550 void OnOpenColorChooser(int color_chooser_id, SkColor color); 551 void OnOpenColorChooser(int color_chooser_id, SkColor color);
551 void OnEndColorChooser(int color_chooser_id); 552 void OnEndColorChooser(int color_chooser_id);
552 void OnSetSelectedColorInColorChooser(int color_chooser_id, SkColor color); 553 void OnSetSelectedColorInColorChooser(int color_chooser_id, SkColor color);
553 void OnPepperPluginHung(int plugin_child_id, 554 void OnPepperPluginHung(int plugin_child_id,
554 const FilePath& path, 555 const FilePath& path,
555 bool is_hung); 556 bool is_hung);
556 void OnWebUISend(const GURL& source_url, 557 void OnWebUISend(const GURL& source_url,
557 const std::string& name, 558 const std::string& name,
558 const base::ListValue& args); 559 const base::ListValue& args);
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 // Maps the ids of pending favicon downloads to their callbacks 860 // Maps the ids of pending favicon downloads to their callbacks
860 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap; 861 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap;
861 FaviconDownloadMap favicon_download_map_; 862 FaviconDownloadMap favicon_download_map_;
862 863
863 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 864 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
864 }; 865 };
865 866
866 } // namespace content 867 } // namespace content
867 868
868 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 869 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698