webkit/common/webpreferences.cc - Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print…

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: webkit/common/webpreferences.cc

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: better Created 7 years, 6 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 | « webkit/common/webdropdata.cc ('k') | webkit/glue/ftp_directory_listing_response_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "webkit/common/webpreferences.h"	5 #include "webkit/common/webpreferences.h"

6	6

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

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

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

10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"	10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"	11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"

12 #include "third_party/icu/public/common/unicode/uchar.h"	12 #include "third_party/icu/public/common/unicode/uchar.h"

13 #include "webkit/glue/webkit_glue.h"	13 #include "webkit/glue/webkit_glue.h"

14	14

15 using WebKit::WebSettings;	15 using WebKit::WebSettings;

16	16

17 WebPreferences::WebPreferences()	17 WebPreferences::WebPreferences()

18 : default_font_size(16),	18 : default_font_size(16),

19 default_fixed_font_size(13),	19 default_fixed_font_size(13),

(...skipping 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 COMPILE_ASSERT_MATCHING_ENUMS(	162 COMPILE_ASSERT_MATCHING_ENUMS(

163 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);	163 webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);

164 COMPILE_ASSERT_MATCHING_ENUMS(	164 COMPILE_ASSERT_MATCHING_ENUMS(

165 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);	165 webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);

166 COMPILE_ASSERT_MATCHING_ENUMS(	166 COMPILE_ASSERT_MATCHING_ENUMS(

167 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);	167 webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);

168 COMPILE_ASSERT_MATCHING_ENUMS(	168 COMPILE_ASSERT_MATCHING_ENUMS(

169 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);	169 webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);

170	170

171 } // namespace webkit_glue	171 } // namespace webkit_glue

OLD	NEW