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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state_io_data.h

Issue 1662843002: Revert of 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_ 5 #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_
6 #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_ 6 #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "base/prefs/pref_member.h"
18 #include "components/content_settings/core/common/content_settings_types.h" 19 #include "components/content_settings/core/common/content_settings_types.h"
19 #include "components/prefs/pref_member.h"
20 #include "ios/chrome/browser/ios_chrome_io_thread.h" 20 #include "ios/chrome/browser/ios_chrome_io_thread.h"
21 #include "ios/chrome/browser/net/net_types.h" 21 #include "ios/chrome/browser/net/net_types.h"
22 #include "net/cert/ct_verifier.h" 22 #include "net/cert/ct_verifier.h"
23 #include "net/cookies/cookie_monster.h" 23 #include "net/cookies/cookie_monster.h"
24 #include "net/http/http_cache.h" 24 #include "net/http/http_cache.h"
25 #include "net/http/http_network_session.h" 25 #include "net/http/http_network_session.h"
26 #include "net/url_request/url_request_context.h" 26 #include "net/url_request/url_request_context.h"
27 #include "net/url_request/url_request_interceptor.h" 27 #include "net/url_request/url_request_interceptor.h"
28 #include "net/url_request/url_request_job_factory.h" 28 #include "net/url_request/url_request_job_factory.h"
29 29
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 319
320 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 320 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
321 bool initialized_on_UI_thread_; 321 bool initialized_on_UI_thread_;
322 322
323 const ios::ChromeBrowserStateType browser_state_type_; 323 const ios::ChromeBrowserStateType browser_state_type_;
324 324
325 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserStateIOData); 325 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserStateIOData);
326 }; 326 };
327 327
328 #endif // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_ 328 #endif // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698