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

Side by Side Diff: content/renderer/render_view.cc

Issue 6869051: Move PepperPluginRegistry to content, while leaving the Chrome specific bits (NaCl, registration ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "content/renderer/render_view.h" 5 #include "content/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "base/string_piece.h" 19 #include "base/string_piece.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/sys_string_conversions.h" 21 #include "base/sys_string_conversions.h"
22 #include "base/time.h" 22 #include "base/time.h"
23 #include "base/utf_string_conversions.h" 23 #include "base/utf_string_conversions.h"
24 #include "chrome/common/bindings_policy.h" 24 #include "chrome/common/bindings_policy.h"
25 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/chrome_paths.h" 26 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/pepper_plugin_registry.h"
29 #include "chrome/common/render_messages.h" 28 #include "chrome/common/render_messages.h"
30 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
31 #include "chrome/renderer/automation/dom_automation_controller.h" 30 #include "chrome/renderer/automation/dom_automation_controller.h"
32 #include "chrome/renderer/external_host_bindings.h" 31 #include "chrome/renderer/external_host_bindings.h"
33 #include "chrome/renderer/localized_error.h" 32 #include "chrome/renderer/localized_error.h"
34 #include "content/common/appcache/appcache_dispatcher.h" 33 #include "content/common/appcache/appcache_dispatcher.h"
35 #include "content/common/clipboard_messages.h" 34 #include "content/common/clipboard_messages.h"
36 #include "content/common/content_constants.h" 35 #include "content/common/content_constants.h"
37 #include "content/common/database_messages.h" 36 #include "content/common/database_messages.h"
38 #include "content/common/drag_messages.h" 37 #include "content/common/drag_messages.h"
39 #include "content/common/file_system/file_system_dispatcher.h" 38 #include "content/common/file_system/file_system_dispatcher.h"
40 #include "content/common/file_system/webfilesystem_callback_dispatcher.h" 39 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
41 #include "content/common/json_value_serializer.h" 40 #include "content/common/json_value_serializer.h"
42 #include "content/common/notification_service.h" 41 #include "content/common/notification_service.h"
43 #include "content/common/pepper_messages.h" 42 #include "content/common/pepper_messages.h"
43 #include "content/common/pepper_plugin_registry.h"
44 #include "content/common/quota_dispatcher.h" 44 #include "content/common/quota_dispatcher.h"
45 #include "content/common/renderer_preferences.h" 45 #include "content/common/renderer_preferences.h"
46 #include "content/common/view_messages.h" 46 #include "content/common/view_messages.h"
47 #include "content/renderer/audio_message_filter.h" 47 #include "content/renderer/audio_message_filter.h"
48 #include "content/renderer/content_renderer_client.h" 48 #include "content/renderer/content_renderer_client.h"
49 #include "content/renderer/device_orientation_dispatcher.h" 49 #include "content/renderer/device_orientation_dispatcher.h"
50 #include "content/renderer/external_popup_menu.h" 50 #include "content/renderer/external_popup_menu.h"
51 #include "content/renderer/geolocation_dispatcher.h" 51 #include "content/renderer/geolocation_dispatcher.h"
52 #include "content/renderer/load_progress_tracker.h" 52 #include "content/renderer/load_progress_tracker.h"
53 #include "content/renderer/media/audio_renderer_impl.h" 53 #include "content/renderer/media/audio_renderer_impl.h"
(...skipping 4564 matching lines...) Expand 10 before | Expand all | Expand 10 after
4618 const webkit_glue::CustomContextMenuContext& custom_context) { 4618 const webkit_glue::CustomContextMenuContext& custom_context) {
4619 if (custom_context.is_pepper_menu) 4619 if (custom_context.is_pepper_menu)
4620 pepper_delegate_.OnContextMenuClosed(custom_context); 4620 pepper_delegate_.OnContextMenuClosed(custom_context);
4621 else 4621 else
4622 context_menu_node_.reset(); 4622 context_menu_node_.reset();
4623 } 4623 }
4624 4624
4625 void RenderView::OnNetworkStateChanged(bool online) { 4625 void RenderView::OnNetworkStateChanged(bool online) {
4626 WebNetworkStateNotifier::setOnLine(online); 4626 WebNetworkStateNotifier::setOnLine(online);
4627 } 4627 }
OLDNEW
« chrome/common/chrome_content_client.cc ('K') | « content/renderer/pepper_plugin_delegate_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698