chrome/browser/chromeos/preferences.cc - Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h

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/preferences.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git

Patch Set: chromeos fixes Created 10 years, 3 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 | « chrome/browser/chromeos/options/language_config_model.cc ('k') | chrome/browser/chromeos/status/language_menu_button.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 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/chromeos/preferences.h"	5 #include "chrome/browser/chromeos/preferences.h"

6	6

	7 #include "base/string_split.h"

7 #include "base/string_util.h"	8 #include "base/string_util.h"

8 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

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

10 #include "chrome/browser/chromeos/cros/cros_library.h"	11 #include "chrome/browser/chromeos/cros/cros_library.h"

11 #include "chrome/browser/chromeos/cros/input_method_library.h"	12 #include "chrome/browser/chromeos/cros/input_method_library.h"

12 #include "chrome/browser/chromeos/cros/keyboard_library.h"	13 #include "chrome/browser/chromeos/cros/keyboard_library.h"

13 #include "chrome/browser/chromeos/cros/touchpad_library.h"	14 #include "chrome/browser/chromeos/cros/touchpad_library.h"

14 #include "chrome/browser/chromeos/input_method/input_method_util.h"	15 #include "chrome/browser/chromeos/input_method/input_method_util.h"

15 #include "chrome/browser/extensions/extensions_service.h"	16 #include "chrome/browser/extensions/extensions_service.h"

16 #include "chrome/browser/prefs/pref_member.h"	17 #include "chrome/browser/prefs/pref_member.h"

(...skipping 422 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
439 }	440 }

440	441

441 if (labs_talk_enabled_.GetValue() == 0) {	442 if (labs_talk_enabled_.GetValue() == 0) {

442 profile_->GetExtensionsService()->DisableExtension(kTalkAppExtensionId);	443 profile_->GetExtensionsService()->DisableExtension(kTalkAppExtensionId);

443 } else {	444 } else {

444 profile_->GetExtensionsService()->EnableExtension(kTalkAppExtensionId);	445 profile_->GetExtensionsService()->EnableExtension(kTalkAppExtensionId);

445 }	446 }

446 }	447 }

447	448

448 } // namespace chromeos	449 } // namespace chromeos

OLD	NEW