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

Side by Side Diff: trunk/src/content/ppapi_plugin/ppapi_thread.cc

Issue 23463037: Revert 223482 "Simplify PPB_NetworkMonitor proxy." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 #include "content/ppapi_plugin/ppapi_thread.h" 5 #include "content/ppapi_plugin/ppapi_thread.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/crash_logging.h" 10 #include "base/debug/crash_logging.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 globals->set_command_line( 96 globals->set_command_line(
97 command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); 97 command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
98 98
99 webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl); 99 webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl);
100 WebKit::initialize(webkit_platform_support_.get()); 100 WebKit::initialize(webkit_platform_support_.get());
101 101
102 // Register interfaces that expect messages from the browser process. Please 102 // Register interfaces that expect messages from the browser process. Please
103 // note that only those InterfaceProxy-based ones require registration. 103 // note that only those InterfaceProxy-based ones require registration.
104 AddRoute(ppapi::API_ID_PPB_HOSTRESOLVER_PRIVATE, 104 AddRoute(ppapi::API_ID_PPB_HOSTRESOLVER_PRIVATE,
105 &dispatcher_message_listener_); 105 &dispatcher_message_listener_);
106 AddRoute(ppapi::API_ID_PPB_NETWORKMANAGER_PRIVATE,
107 &dispatcher_message_listener_);
106 } 108 }
107 109
108 PpapiThread::~PpapiThread() { 110 PpapiThread::~PpapiThread() {
109 } 111 }
110 112
111 void PpapiThread::Shutdown() { 113 void PpapiThread::Shutdown() {
112 ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL); 114 ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL);
113 if (plugin_entry_points_.shutdown_module) 115 if (plugin_entry_points_.shutdown_module)
114 plugin_entry_points_.shutdown_module(); 116 plugin_entry_points_.shutdown_module();
115 WebKit::shutdown(); 117 WebKit::shutdown();
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 histogram_name.str(), 497 histogram_name.str(),
496 1, 498 1,
497 LOAD_RESULT_MAX, 499 LOAD_RESULT_MAX,
498 LOAD_RESULT_MAX + 1, 500 LOAD_RESULT_MAX + 1,
499 base::HistogramBase::kUmaTargetedHistogramFlag); 501 base::HistogramBase::kUmaTargetedHistogramFlag);
500 502
501 histogram->Add(result); 503 histogram->Add(result);
502 } 504 }
503 505
504 } // namespace content 506 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/content_browser.gypi ('k') | trunk/src/content/public/common/socket_permission_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698