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

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

Issue 16328003: Move a bunch of child-only code from content/common to content/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 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"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/process_util.h" 13 #include "base/process_util.h"
14 #include "base/rand_util.h" 14 #include "base/rand_util.h"
15 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
16 #include "base/threading/platform_thread.h" 16 #include "base/threading/platform_thread.h"
17 #include "base/time.h" 17 #include "base/time.h"
18 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
19 #include "content/common/child_process.h" 19 #include "content/child/child_process.h"
20 #include "content/common/child_process_messages.h" 20 #include "content/common/child_process_messages.h"
21 #include "content/common/sandbox_util.h" 21 #include "content/common/sandbox_util.h"
22 #include "content/ppapi_plugin/broker_process_dispatcher.h" 22 #include "content/ppapi_plugin/broker_process_dispatcher.h"
23 #include "content/ppapi_plugin/plugin_process_dispatcher.h" 23 #include "content/ppapi_plugin/plugin_process_dispatcher.h"
24 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h" 24 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
25 #include "content/public/common/content_client.h" 25 #include "content/public/common/content_client.h"
26 #include "content/public/common/pepper_plugin_info.h" 26 #include "content/public/common/pepper_plugin_info.h"
27 #include "content/public/common/sandbox_init.h" 27 #include "content/public/common/sandbox_init.h"
28 #include "content/public/plugin/content_plugin_client.h" 28 #include "content/public/plugin/content_plugin_client.h"
29 #include "ipc/ipc_channel_handle.h" 29 #include "ipc/ipc_channel_handle.h"
30 #include "ipc/ipc_platform_file.h" 30 #include "ipc/ipc_platform_file.h"
31 #include "ipc/ipc_sync_channel.h" 31 #include "ipc/ipc_sync_channel.h"
32 #include "ipc/ipc_sync_message_filter.h" 32 #include "ipc/ipc_sync_message_filter.h"
33 #include "ppapi/c/dev/ppp_network_state_dev.h" 33 #include "ppapi/c/dev/ppp_network_state_dev.h"
34 #include "ppapi/c/pp_errors.h" 34 #include "ppapi/c/pp_errors.h"
35 #include "ppapi/c/ppp.h" 35 #include "ppapi/c/ppp.h"
36 #include "ppapi/proxy/interface_list.h"
36 #include "ppapi/proxy/plugin_globals.h" 37 #include "ppapi/proxy/plugin_globals.h"
37 #include "ppapi/proxy/ppapi_messages.h" 38 #include "ppapi/proxy/ppapi_messages.h"
38 #include "ppapi/proxy/interface_list.h"
39 #include "ppapi/shared_impl/api_id.h" 39 #include "ppapi/shared_impl/api_id.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
41 #include "ui/base/ui_base_switches.h" 41 #include "ui/base/ui_base_switches.h"
42 #include "webkit/plugins/plugin_switches.h" 42 #include "webkit/plugins/plugin_switches.h"
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "base/win/win_util.h" 45 #include "base/win/win_util.h"
46 #include "sandbox/win/src/sandbox.h" 46 #include "sandbox/win/src/sandbox.h"
47 #elif defined(OS_MACOSX) 47 #elif defined(OS_MACOSX)
48 #include "content/common/sandbox_init_mac.h" 48 #include "content/common/sandbox_init_mac.h"
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 histogram_name.str(), 494 histogram_name.str(),
495 1, 495 1,
496 LOAD_RESULT_MAX, 496 LOAD_RESULT_MAX,
497 LOAD_RESULT_MAX + 1, 497 LOAD_RESULT_MAX + 1,
498 base::HistogramBase::kUmaTargetedHistogramFlag); 498 base::HistogramBase::kUmaTargetedHistogramFlag);
499 499
500 histogram->Add(result); 500 histogram->Add(result);
501 } 501 }
502 502
503 } // namespace content 503 } // namespace content
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.h ('k') | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698