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

Side by Side Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 1662523004: Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « ios/web/DEPS ('k') | mash/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "ios/web/web_state/ui/crw_web_controller.h" 5 #import "ios/web/web_state/ui/crw_web_controller.h"
6 6
7 #import <objc/runtime.h> 7 #import <objc/runtime.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <cmath> 10 #include <cmath>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/ios/block_types.h" 13 #include "base/ios/block_types.h"
14 #import "base/ios/ns_error_util.h" 14 #import "base/ios/ns_error_util.h"
15 #include "base/ios/weak_nsobject.h" 15 #include "base/ios/weak_nsobject.h"
16 #include "base/json/json_reader.h" 16 #include "base/json/json_reader.h"
17 #include "base/json/json_writer.h" 17 #include "base/json/json_writer.h"
18 #include "base/json/string_escape.h" 18 #include "base/json/string_escape.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/mac/bundle_locations.h" 20 #include "base/mac/bundle_locations.h"
21 #include "base/mac/foundation_util.h" 21 #include "base/mac/foundation_util.h"
22 #include "base/mac/objc_property_releaser.h" 22 #include "base/mac/objc_property_releaser.h"
23 #include "base/mac/scoped_cftyperef.h" 23 #include "base/mac/scoped_cftyperef.h"
24 #include "base/mac/scoped_nsobject.h" 24 #include "base/mac/scoped_nsobject.h"
25 #include "base/memory/scoped_ptr.h" 25 #include "base/memory/scoped_ptr.h"
26 #include "base/metrics/histogram.h" 26 #include "base/metrics/histogram.h"
27 #include "base/metrics/user_metrics_action.h" 27 #include "base/metrics/user_metrics_action.h"
28 #include "base/prefs/pref_service.h"
29 #include "base/strings/string_util.h" 28 #include "base/strings/string_util.h"
30 #include "base/strings/sys_string_conversions.h" 29 #include "base/strings/sys_string_conversions.h"
31 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
32 #include "base/time/time.h" 31 #include "base/time/time.h"
33 #include "base/values.h" 32 #include "base/values.h"
33 #include "components/prefs/pref_service.h"
34 #include "components/url_formatter/url_formatter.h" 34 #include "components/url_formatter/url_formatter.h"
35 #import "ios/net/nsurlrequest_util.h" 35 #import "ios/net/nsurlrequest_util.h"
36 #include "ios/public/provider/web/web_ui_ios.h" 36 #include "ios/public/provider/web/web_ui_ios.h"
37 #import "ios/web/history_state_util.h" 37 #import "ios/web/history_state_util.h"
38 #include "ios/web/interstitials/web_interstitial_impl.h" 38 #include "ios/web/interstitials/web_interstitial_impl.h"
39 #import "ios/web/navigation/crw_session_certificate_policy_manager.h" 39 #import "ios/web/navigation/crw_session_certificate_policy_manager.h"
40 #import "ios/web/navigation/crw_session_controller.h" 40 #import "ios/web/navigation/crw_session_controller.h"
41 #import "ios/web/navigation/crw_session_entry.h" 41 #import "ios/web/navigation/crw_session_entry.h"
42 #import "ios/web/navigation/navigation_item_impl.h" 42 #import "ios/web/navigation/navigation_item_impl.h"
43 #import "ios/web/navigation/navigation_manager_impl.h" 43 #import "ios/web/navigation/navigation_manager_impl.h"
(...skipping 3871 matching lines...) Expand 10 before | Expand all | Expand 10 after
3915 if ([MIMEType isEqualToString:@"text/html"] || 3915 if ([MIMEType isEqualToString:@"text/html"] ||
3916 [MIMEType isEqualToString:@"application/xhtml+xml"] || 3916 [MIMEType isEqualToString:@"application/xhtml+xml"] ||
3917 [MIMEType isEqualToString:@"application/xml"]) { 3917 [MIMEType isEqualToString:@"application/xml"]) {
3918 return web::WEB_VIEW_DOCUMENT_TYPE_HTML; 3918 return web::WEB_VIEW_DOCUMENT_TYPE_HTML;
3919 } 3919 }
3920 3920
3921 return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC; 3921 return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
3922 } 3922 }
3923 3923
3924 @end 3924 @end
OLDNEW
« no previous file with comments | « ios/web/DEPS ('k') | mash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698