chrome/browser/ui/options/options_util.cc - Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location....

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/ui/options/options_util.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 9 years, 11 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/ui/browser_init.cc ('k') | chrome/browser/ui/views/about_ipc_dialog.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/ui/options/options_util.h"	5 #include "chrome/browser/ui/options/options_util.h"

6	6

7 #include "base/thread_restrictions.h"	7 #include "base/threading/thread_restrictions.h"

8 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/download/download_manager.h"	9 #include "chrome/browser/download/download_manager.h"

10 #include "chrome/browser/download/download_prefs.h"	10 #include "chrome/browser/download/download_prefs.h"

11 #include "chrome/browser/content_settings/host_content_settings_map.h"	11 #include "chrome/browser/content_settings/host_content_settings_map.h"

12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

13 #include "chrome/browser/host_zoom_map.h"	13 #include "chrome/browser/host_zoom_map.h"

14 #include "chrome/browser/metrics/metrics_service.h"	14 #include "chrome/browser/metrics/metrics_service.h"

15 #include "chrome/browser/notifications/desktop_notification_service.h"	15 #include "chrome/browser/notifications/desktop_notification_service.h"

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

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

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
125 if (metrics) {	125 if (metrics) {

126 metrics->SetUserPermitsUpload(enabled);	126 metrics->SetUserPermitsUpload(enabled);

127 if (enabled)	127 if (enabled)

128 metrics->Start();	128 metrics->Start();

129 else	129 else

130 metrics->Stop();	130 metrics->Stop();

131 }	131 }

132	132

133 return enabled;	133 return enabled;

134 }	134 }

OLD	NEW