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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comment I missed in the last patch. Created 6 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.h » ('J')
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 "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 #include "grit/app_locale_settings.h" 126 #include "grit/app_locale_settings.h"
127 #include "grit/browser_resources.h" 127 #include "grit/browser_resources.h"
128 #include "grit/chromium_strings.h" 128 #include "grit/chromium_strings.h"
129 #include "grit/generated_resources.h" 129 #include "grit/generated_resources.h"
130 #include "grit/platform_locale_settings.h" 130 #include "grit/platform_locale_settings.h"
131 #include "net/base/net_module.h" 131 #include "net/base/net_module.h"
132 #include "net/base/sdch_manager.h" 132 #include "net/base/sdch_manager.h"
133 #include "net/cookies/cookie_monster.h" 133 #include "net/cookies/cookie_monster.h"
134 #include "net/http/http_network_layer.h" 134 #include "net/http/http_network_layer.h"
135 #include "net/http/http_stream_factory.h" 135 #include "net/http/http_stream_factory.h"
136 #include "net/socket/ssl_client_socket_pool.h"
wtc 2014/07/23 22:53:32 Please remove this line. It's no longer needed.
mshelley 2014/07/24 20:37:46 Done.
136 #include "net/url_request/url_request.h" 137 #include "net/url_request/url_request.h"
137 #include "ui/base/l10n/l10n_util.h" 138 #include "ui/base/l10n/l10n_util.h"
138 #include "ui/base/layout.h" 139 #include "ui/base/layout.h"
139 #include "ui/base/resource/resource_bundle.h" 140 #include "ui/base/resource/resource_bundle.h"
140 141
141 #if defined(OS_ANDROID) 142 #if defined(OS_ANDROID)
142 #include "chrome/browser/metrics/thread_watcher_android.h" 143 #include "chrome/browser/metrics/thread_watcher_android.h"
143 #else 144 #else
144 #include "chrome/browser/feedback/feedback_profile_observer.h" 145 #include "chrome/browser/feedback/feedback_profile_observer.h"
145 #endif 146 #endif
(...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1654 chromeos::CrosSettings::Shutdown(); 1655 chromeos::CrosSettings::Shutdown();
1655 #endif 1656 #endif
1656 #endif 1657 #endif
1657 } 1658 }
1658 1659
1659 // Public members: 1660 // Public members:
1660 1661
1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1662 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1662 chrome_extra_parts_.push_back(parts); 1663 chrome_extra_parts_.push_back(parts);
1663 } 1664 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698