chrome/browser/net/net_error_tab_helper.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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/net/net_error_tab_helper.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/net/http_server_properties_manager_unittest.cc ('k') | chrome/browser/net/net_pref_observer.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/net/net_error_tab_helper.h"	5 #include "chrome/browser/net/net_error_tab_helper.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/metrics/field_trial.h"	8 #include "base/metrics/field_trial.h"

	9 #include "base/prefs/pref_service.h"

9 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/io_thread.h"	11 #include "chrome/browser/io_thread.h"

11 #include "chrome/browser/net/dns_probe_service.h"	12 #include "chrome/browser/net/dns_probe_service.h"

12 #include "chrome/browser/prefs/pref_service.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/common/net/net_error_info.h"	14 #include "chrome/common/net/net_error_info.h"

15 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

16 #include "chrome/common/render_messages.h"	16 #include "chrome/common/render_messages.h"

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

18 #include "net/base/net_errors.h"	18 #include "net/base/net_errors.h"

19	19

20 using base::FieldTrialList;	20 using base::FieldTrialList;

21 using chrome_common_net::DnsProbeResult;	21 using chrome_common_net::DnsProbeResult;

22 using content::BrowserContext;	22 using content::BrowserContext;

(...skipping 216 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
239 if (testing_state_ != TESTING_DEFAULT)	239 if (testing_state_ != TESTING_DEFAULT)

240 return testing_state_ == TESTING_FORCE_ENABLED;	240 return testing_state_ == TESTING_FORCE_ENABLED;

241	241

242 // TODO(ttuttle): Disable on mobile?	242 // TODO(ttuttle): Disable on mobile?

243 return enabled_by_trial_	243 return enabled_by_trial_

244 && pref_initialized_	244 && pref_initialized_

245 && *resolve_errors_with_web_service_;	245 && *resolve_errors_with_web_service_;

246 }	246 }

247	247

248 } // namespace chrome_browser_net	248 } // namespace chrome_browser_net

OLD	NEW