chrome/browser/chromeos/preferences_unittest.cc - Issue 1547093002: Switch to standard integer types 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/preferences_unittest.cc

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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/preferences_chromeos_browsertest.cc ('k') | chrome/browser/chromeos/printer_detector/printer_detector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/preferences.h"	5 #include "chrome/browser/chromeos/preferences.h"

6	6

7 #include "base/json/json_string_value_serializer.h"	7 #include "base/json/json_string_value_serializer.h"

	8 #include "base/macros.h"

8 #include "base/prefs/pref_member.h"	9 #include "base/prefs/pref_member.h"

9 #include "base/strings/string_split.h"	10 #include "base/strings/string_split.h"

10 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

11 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"	12 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"

12 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"	13 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"

13 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	14 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

14 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"	15 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"

15 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"	16 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

16 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"	17 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"

17 #include "chrome/common/chrome_constants.h"	18 #include "chrome/common/chrome_constants.h"

(...skipping 681 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
699 "Syncable values should have added local values on initialization.");	700 "Syncable values should have added local values on initialization.");

700 ExpectGlobalValues(	701 ExpectGlobalValues(

701 "es,en-US",	702 "es,en-US",

702 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," +	703 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," +

703 ToInputMethodIds("xkb:jp::jpn"),	704 ToInputMethodIds("xkb:jp::jpn"),

704 std::string(kIdentityIMEID) + "," + kUnknownIMEID);	705 std::string(kIdentityIMEID) + "," + kUnknownIMEID);

705 }	706 }

706 }	707 }

707	708

708 } // namespace chromeos	709 } // namespace chromeos

OLD	NEW