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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 9924010: Revert 129627 - Add a sandbox API for broker handle duplication (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/common/sandbox_init_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
16 #include "content/browser/browser_thread_impl.h" 16 #include "content/browser/browser_thread_impl.h"
17 #include "content/browser/download/download_file_manager.h" 17 #include "content/browser/download/download_file_manager.h"
18 #include "content/browser/download/save_file_manager.h" 18 #include "content/browser/download/save_file_manager.h"
19 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 19 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
20 #include "content/browser/gpu/gpu_process_host.h" 20 #include "content/browser/gpu/gpu_process_host.h"
21 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 21 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
22 #include "content/browser/in_process_webkit/webkit_thread.h" 22 #include "content/browser/in_process_webkit/webkit_thread.h"
23 #include "content/browser/net/browser_online_state_observer.h" 23 #include "content/browser/net/browser_online_state_observer.h"
24 #include "content/browser/plugin_service_impl.h" 24 #include "content/browser/plugin_service_impl.h"
25 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" 25 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
26 #include "content/browser/trace_controller_impl.h" 26 #include "content/browser/trace_controller_impl.h"
27 #include "content/common/hi_res_timer_manager.h" 27 #include "content/common/hi_res_timer_manager.h"
28 #include "content/common/sandbox_policy.h"
28 #include "content/public/browser/browser_main_parts.h" 29 #include "content/public/browser/browser_main_parts.h"
29 #include "content/public/browser/browser_shutdown.h" 30 #include "content/public/browser/browser_shutdown.h"
30 #include "content/public/browser/content_browser_client.h" 31 #include "content/public/browser/content_browser_client.h"
31 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
32 #include "content/public/common/content_switches.h" 33 #include "content/public/common/content_switches.h"
33 #include "content/public/common/main_function_params.h" 34 #include "content/public/common/main_function_params.h"
34 #include "content/public/common/result_codes.h" 35 #include "content/public/common/result_codes.h"
35 #include "crypto/nss_util.h" 36 #include "crypto/nss_util.h"
36 #include "media/audio/audio_manager.h" 37 #include "media/audio/audio_manager.h"
37 #include "net/base/network_change_notifier.h" 38 #include "net/base/network_change_notifier.h"
38 #include "net/base/ssl_config_service.h" 39 #include "net/base/ssl_config_service.h"
39 #include "net/socket/client_socket_factory.h" 40 #include "net/socket/client_socket_factory.h"
40 #include "net/socket/tcp_client_socket.h" 41 #include "net/socket/tcp_client_socket.h"
41 42
42 #if defined(USE_AURA) 43 #if defined(USE_AURA)
43 #include "content/browser/renderer_host/image_transport_factory.h" 44 #include "content/browser/renderer_host/image_transport_factory.h"
44 #endif 45 #endif
45 46
46 #if defined(OS_WIN) 47 #if defined(OS_WIN)
47 #include <windows.h> 48 #include <windows.h>
48 #include <commctrl.h> 49 #include <commctrl.h>
49 #include <shellapi.h> 50 #include <shellapi.h>
50 51
51 #include "content/browser/system_message_window_win.h" 52 #include "content/browser/system_message_window_win.h"
52 #include "content/common/sandbox_policy.h"
53 #include "ui/base/l10n/l10n_util_win.h" 53 #include "ui/base/l10n/l10n_util_win.h"
54 #include "net/base/winsock_init.h" 54 #include "net/base/winsock_init.h"
55 #endif 55 #endif
56 56
57 #if defined(OS_LINUX) 57 #if defined(OS_LINUX)
58 #include "content/browser/media_device_notifications_linux.h" 58 #include "content/browser/media_device_notifications_linux.h"
59 #endif 59 #endif
60 60
61 #if defined(OS_LINUX) || defined(OS_OPENBSD) 61 #if defined(OS_LINUX) || defined(OS_OPENBSD)
62 #include <glib-object.h> 62 #include <glib-object.h>
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); 649 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
650 650
651 #if defined(OS_MACOSX) 651 #if defined(OS_MACOSX)
652 MessageLoopForUI::current()->Run(); 652 MessageLoopForUI::current()->Run();
653 #else 653 #else
654 MessageLoopForUI::current()->RunWithDispatcher(NULL); 654 MessageLoopForUI::current()->RunWithDispatcher(NULL);
655 #endif 655 #endif
656 } 656 }
657 657
658 } // namespace content 658 } // namespace content
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/common/sandbox_init_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698