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

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

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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/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/hi_res_timer_manager.h" 10 #include "base/hi_res_timer_manager.h"
(...skipping 27 matching lines...) Expand all
38 #include "content/public/browser/browser_shutdown.h" 38 #include "content/public/browser/browser_shutdown.h"
39 #include "content/public/browser/compositor_util.h" 39 #include "content/public/browser/compositor_util.h"
40 #include "content/public/browser/content_browser_client.h" 40 #include "content/public/browser/content_browser_client.h"
41 #include "content/public/browser/render_process_host.h" 41 #include "content/public/browser/render_process_host.h"
42 #include "content/public/common/content_switches.h" 42 #include "content/public/common/content_switches.h"
43 #include "content/public/common/main_function_params.h" 43 #include "content/public/common/main_function_params.h"
44 #include "content/public/common/result_codes.h" 44 #include "content/public/common/result_codes.h"
45 #include "crypto/nss_util.h" 45 #include "crypto/nss_util.h"
46 #include "media/audio/audio_manager.h" 46 #include "media/audio/audio_manager.h"
47 #include "net/base/network_change_notifier.h" 47 #include "net/base/network_change_notifier.h"
48 #include "net/base/ssl_config_service.h"
49 #include "net/socket/client_socket_factory.h" 48 #include "net/socket/client_socket_factory.h"
50 #include "net/socket/tcp_client_socket.h" 49 #include "net/socket/tcp_client_socket.h"
50 #include "net/ssl/ssl_config_service.h"
51 #include "ui/base/clipboard/clipboard.h" 51 #include "ui/base/clipboard/clipboard.h"
52 52
53 #if defined(USE_AURA) 53 #if defined(USE_AURA)
54 #include "content/browser/renderer_host/image_transport_factory.h" 54 #include "content/browser/renderer_host/image_transport_factory.h"
55 #endif 55 #endif
56 56
57 #if defined(OS_ANDROID) 57 #if defined(OS_ANDROID)
58 #include "base/android/jni_android.h" 58 #include "base/android/jni_android.h"
59 #include "content/browser/android/surface_texture_peer_browser_impl.h" 59 #include "content/browser/android/surface_texture_peer_browser_impl.h"
60 #include "content/browser/device_orientation/data_fetcher_impl_android.h" 60 #include "content/browser/device_orientation/data_fetcher_impl_android.h"
61 // TODO(epenner): Move thread priorities to base. (crbug.com/170549) 61 // TODO(epenner): Move thread priorities to base. (crbug.com/170549)
62 #include <sys/resource.h> 62 #include <sys/resource.h>
63 #endif 63 #endif
64 64
65 #if defined(OS_WIN) 65 #if defined(OS_WIN)
66 #include <windows.h> 66 #include <windows.h>
67 #include <commctrl.h> 67 #include <commctrl.h>
68 #include <shellapi.h> 68 #include <shellapi.h>
69 69
70 #include "content/browser/system_message_window_win.h" 70 #include "content/browser/system_message_window_win.h"
71 #include "content/common/sandbox_policy.h" 71 #include "content/common/sandbox_policy.h"
72 #include "net/base/winsock_init.h"
72 #include "ui/base/l10n/l10n_util_win.h" 73 #include "ui/base/l10n/l10n_util_win.h"
73 #include "net/base/winsock_init.h"
74 #endif 74 #endif
75 75
76 #if defined(OS_LINUX) || defined(OS_OPENBSD) 76 #if defined(OS_LINUX) || defined(OS_OPENBSD)
77 #include <glib-object.h> 77 #include <glib-object.h>
78 #endif 78 #endif
79 79
80 #if defined(OS_LINUX) 80 #if defined(OS_LINUX)
81 #include "content/browser/device_monitor_linux.h" 81 #include "content/browser/device_monitor_linux.h"
82 #elif defined(OS_MACOSX) && !defined(OS_IOS) 82 #elif defined(OS_MACOSX) && !defined(OS_IOS)
83 #include "content/browser/device_monitor_mac.h" 83 #include "content/browser/device_monitor_mac.h"
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); 812 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
813 if (parameters_.ui_task) 813 if (parameters_.ui_task)
814 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); 814 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
815 815
816 base::RunLoop run_loop; 816 base::RunLoop run_loop;
817 run_loop.Run(); 817 run_loop.Run();
818 #endif 818 #endif
819 } 819 }
820 820
821 } // namespace content 821 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698