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

Side by Side Diff: chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #include "content/public/browser/site_instance.h" 107 #include "content/public/browser/site_instance.h"
108 #include "content/public/browser/web_contents.h" 108 #include "content/public/browser/web_contents.h"
109 #include "content/public/browser/web_contents_view.h" 109 #include "content/public/browser/web_contents_view.h"
110 #include "content/public/common/child_process_host.h" 110 #include "content/public/common/child_process_host.h"
111 #include "content/public/common/content_descriptors.h" 111 #include "content/public/common/content_descriptors.h"
112 #include "extensions/common/constants.h" 112 #include "extensions/common/constants.h"
113 #include "grit/generated_resources.h" 113 #include "grit/generated_resources.h"
114 #include "grit/ui_resources.h" 114 #include "grit/ui_resources.h"
115 #include "net/base/escape.h" 115 #include "net/base/escape.h"
116 #include "net/base/mime_util.h" 116 #include "net/base/mime_util.h"
117 #include "net/base/ssl_cert_request_info.h"
118 #include "net/cookies/canonical_cookie.h" 117 #include "net/cookies/canonical_cookie.h"
119 #include "net/cookies/cookie_options.h" 118 #include "net/cookies/cookie_options.h"
119 #include "net/ssl/ssl_cert_request_info.h"
120 #include "ppapi/host/ppapi_host.h" 120 #include "ppapi/host/ppapi_host.h"
121 #include "ui/base/l10n/l10n_util.h" 121 #include "ui/base/l10n/l10n_util.h"
122 #include "ui/base/resource/resource_bundle.h" 122 #include "ui/base/resource/resource_bundle.h"
123 #include "webkit/glue/webpreferences.h" 123 #include "webkit/glue/webpreferences.h"
124 #include "webkit/plugins/plugin_switches.h" 124 #include "webkit/plugins/plugin_switches.h"
125 125
126 #if defined(OS_WIN) 126 #if defined(OS_WIN)
127 #include "chrome/browser/chrome_browser_main_win.h" 127 #include "chrome/browser/chrome_browser_main_win.h"
128 #elif defined(OS_MACOSX) 128 #elif defined(OS_MACOSX)
129 #include "chrome/browser/chrome_browser_main_mac.h" 129 #include "chrome/browser/chrome_browser_main_mac.h"
(...skipping 1994 matching lines...) Expand 10 before | Expand all | Expand 10 after
2124 io_thread_application_locale_ = locale; 2124 io_thread_application_locale_ = locale;
2125 } 2125 }
2126 2126
2127 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2127 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2128 const std::string& locale) { 2128 const std::string& locale) {
2129 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2129 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2130 io_thread_application_locale_ = locale; 2130 io_thread_application_locale_ = locale;
2131 } 2131 }
2132 2132
2133 } // namespace chrome 2133 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698