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

Side by Side Diff: chrome/browser/io_thread.h

Issue 1403863002: Enable exporting SSLKEYLOGFILE on Android w/ command line arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapping up Created 5 years, 2 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.cc » ('j') | chrome/browser/io_thread.cc » ('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 #ifndef CHROME_BROWSER_IO_THREAD_H_ 5 #ifndef CHROME_BROWSER_IO_THREAD_H_
6 #define CHROME_BROWSER_IO_THREAD_H_ 6 #define CHROME_BROWSER_IO_THREAD_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 private: 259 private:
260 // Map from name to value for all parameters associate with a field trial. 260 // Map from name to value for all parameters associate with a field trial.
261 typedef std::map<std::string, std::string> VariationParameters; 261 typedef std::map<std::string, std::string> VariationParameters;
262 262
263 // Provide SystemURLRequestContextGetter with access to 263 // Provide SystemURLRequestContextGetter with access to
264 // InitSystemRequestContext(). 264 // InitSystemRequestContext().
265 friend class SystemURLRequestContextGetter; 265 friend class SystemURLRequestContextGetter;
266 266
267 friend class test::IOThreadPeer; 267 friend class test::IOThreadPeer;
268 268
269 // Gets file path into ssl_keylog_file from command line argument or
270 // environment variable. Command line argument has priority when
271 // both specified.
272 void GetSSLKeyLogFile(const base::CommandLine& command_line,
Bryan McQuade 2015/10/15 19:11:13 this should return std::string rather than using a
Zhongyi Shi 2015/10/15 19:47:57 Done.
273 std::string& ssl_keylog_file);
274
269 // BrowserThreadDelegate implementation, runs on the IO thread. 275 // BrowserThreadDelegate implementation, runs on the IO thread.
270 // This handles initialization and destruction of state that must 276 // This handles initialization and destruction of state that must
271 // live on the IO thread. 277 // live on the IO thread.
272 void Init() override; 278 void Init() override;
273 void CleanUp() override; 279 void CleanUp() override;
274 280
275 // Initializes |params| based on the settings in |globals|. 281 // Initializes |params| based on the settings in |globals|.
276 static void InitializeNetworkSessionParamsFromGlobals( 282 static void InitializeNetworkSessionParamsFromGlobals(
277 const Globals& globals, 283 const Globals& globals,
278 net::HttpNetworkSession::Params* params); 284 net::HttpNetworkSession::Params* params);
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 bool is_quic_allowed_by_policy_; 520 bool is_quic_allowed_by_policy_;
515 521
516 const base::TimeTicks creation_time_; 522 const base::TimeTicks creation_time_;
517 523
518 base::WeakPtrFactory<IOThread> weak_factory_; 524 base::WeakPtrFactory<IOThread> weak_factory_;
519 525
520 DISALLOW_COPY_AND_ASSIGN(IOThread); 526 DISALLOW_COPY_AND_ASSIGN(IOThread);
521 }; 527 };
522 528
523 #endif // CHROME_BROWSER_IO_THREAD_H_ 529 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | chrome/browser/io_thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698