content/browser/browser_main_loop.cc - Issue 12680003: net: split net/ssl out of net/base - Code Review

Chromium Code Reviews

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

(256)

My Issues | Starred Open | Closed | All

Unified 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 side-by-side diff with in-line comments

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 03fb379a44ce96b7ef3daaca74c091e3c9f2a804..7b05cb89070f4e94ca9d51785e03976c3d1e50fc 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -45,9 +45,9 @@

#include "crypto/nss_util.h"

#include "media/audio/audio_manager.h"

#include "net/base/network_change_notifier.h"

-#include "net/base/ssl_config_service.h"

#include "net/socket/client_socket_factory.h"

#include "net/socket/tcp_client_socket.h"

+#include "net/ssl/ssl_config_service.h"

#include "ui/base/clipboard/clipboard.h"

#if defined(USE_AURA)

@@ -69,8 +69,8 @@

#include "content/browser/system_message_window_win.h"

#include "content/common/sandbox_policy.h"

-#include "ui/base/l10n/l10n_util_win.h"

#include "net/base/winsock_init.h"

+#include "ui/base/l10n/l10n_util_win.h"

#endif

#if defined(OS_LINUX) || defined(OS_OPENBSD)

« 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