chrome/browser/prefs/pref_service_unittest.cc - Issue 10107014: Migrate WebKit "global script" font 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/prefs/pref_service_unittest.cc

Issue 10107014: Migrate WebKit "global script" font prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments Created 8 years, 7 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/extensions/extension_font_settings_apitest.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc » ('j') | ppapi/shared_impl/private/ppb_browser_font_trusted_shared.cc » ('J')
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 <string>	5 #include <string>

6	6

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

8 #include "base/file_util.h"	8 #include "base/file_util.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

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

(...skipping 386 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397 EXPECT_TRUE(webkit_prefs.uses_universal_detector);	397 EXPECT_TRUE(webkit_prefs.uses_universal_detector);

398	398

399 // These should still be the default values.	399 // These should still be the default values.

400 #if defined(OS_MACOSX)	400 #if defined(OS_MACOSX)

401 const char kDefaultFont[] = "Times";	401 const char kDefaultFont[] = "Times";

402 #elif defined(OS_CHROMEOS)	402 #elif defined(OS_CHROMEOS)

403 const char kDefaultFont[] = "Tinos";	403 const char kDefaultFont[] = "Tinos";

404 #else	404 #else

405 const char kDefaultFont[] = "Times New Roman";	405 const char kDefaultFont[] = "Times New Roman";

406 #endif	406 #endif

407 EXPECT_EQ(ASCIIToUTF16(kDefaultFont), webkit_prefs.standard_font_family);	407 EXPECT_EQ(ASCIIToUTF16(kDefaultFont),

	408 webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);

408 EXPECT_TRUE(webkit_prefs.javascript_enabled);	409 EXPECT_TRUE(webkit_prefs.javascript_enabled);

409 }	410 }

OLD	NEW