chrome/browser/chromeos/cros/cert_library.cc - Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/cros/cert_library.cc

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/chromeos/cros/cert_library.h ('k') | chrome/browser/chromeos/cros/native_network_parser.cc » ('j') | no next file with comments »

OLD	NEW
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/chromeos/cros/cert_library.h"	5 #include "chrome/browser/chromeos/cros/cert_library.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "base/chromeos/chromeos_version.h"	9 #include "base/chromeos/chromeos_version.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/i18n/string_compare.h"	11 #include "base/i18n/string_compare.h"

12 #include "base/memory/weak_ptr.h"	12 #include "base/memory/weak_ptr.h"

13 #include "base/observer_list_threadsafe.h"	13 #include "base/observer_list_threadsafe.h"

14 #include "base/string_util.h"

15 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

	15 #include "base/strings/string_util.h"

16 #include "base/strings/utf_string_conversions.h"	16 #include "base/strings/utf_string_conversions.h"

17 #include "chrome/browser/browser_process.h" // g_browser_process	17 #include "chrome/browser/browser_process.h" // g_browser_process

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/net/x509_certificate_model.h"	19 #include "chrome/common/net/x509_certificate_model.h"

20 #include "chromeos/dbus/cryptohome_client.h"	20 #include "chromeos/dbus/cryptohome_client.h"

21 #include "chromeos/dbus/dbus_thread_manager.h"	21 #include "chromeos/dbus/dbus_thread_manager.h"

22 #include "chromeos/login/login_state.h"	22 #include "chromeos/login/login_state.h"

23 #include "content/public/browser/browser_thread.h"	23 #include "content/public/browser/browser_thread.h"

24 #include "crypto/nss_util.h"	24 #include "crypto/nss_util.h"

25 #include "grit/generated_resources.h"	25 #include "grit/generated_resources.h"

(...skipping 241 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
267 return user_certs_;	267 return user_certs_;

268 if (type == CERT_TYPE_SERVER)	268 if (type == CERT_TYPE_SERVER)

269 return server_certs_;	269 return server_certs_;

270 if (type == CERT_TYPE_SERVER_CA)	270 if (type == CERT_TYPE_SERVER_CA)

271 return server_ca_certs_;	271 return server_ca_certs_;

272 DCHECK(type == CERT_TYPE_DEFAULT);	272 DCHECK(type == CERT_TYPE_DEFAULT);

273 return certs_;	273 return certs_;

274 }	274 }

275	275

276 } // chromeos	276 } // chromeos

OLD	NEW