Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « webkit/fileapi/file_system_dir_url_request_job_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "webkit/glue/webpreferences.h" 5 #include "webkit/glue/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/utf_string_conversions.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
18 #include "unicode/uchar.h" 18 #include "third_party/icu/public/common/unicode/uchar.h"
19 #include "webkit/glue/webkit_glue.h" 19 #include "webkit/glue/webkit_glue.h"
20 20
21 using WebKit::WebNetworkStateNotifier; 21 using WebKit::WebNetworkStateNotifier;
22 using WebKit::WebRuntimeFeatures; 22 using WebKit::WebRuntimeFeatures;
23 using WebKit::WebSettings; 23 using WebKit::WebSettings;
24 using WebKit::WebSize; 24 using WebKit::WebSize;
25 using WebKit::WebString; 25 using WebKit::WebString;
26 using WebKit::WebURL; 26 using WebKit::WebURL;
27 using WebKit::WebView; 27 using WebKit::WebView;
28 28
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 mismatching_enums) 486 mismatching_enums)
487 487
488 COMPILE_ASSERT_MATCHING_ENUMS( 488 COMPILE_ASSERT_MATCHING_ENUMS(
489 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 489 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
490 COMPILE_ASSERT_MATCHING_ENUMS( 490 COMPILE_ASSERT_MATCHING_ENUMS(
491 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 491 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
492 COMPILE_ASSERT_MATCHING_ENUMS( 492 COMPILE_ASSERT_MATCHING_ENUMS(
493 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 493 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
494 494
495 } // namespace webkit_glue 495 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/fileapi/file_system_dir_url_request_job_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698