diff options
| author | sdefresne <sdefresne@chromium.org> | 2016-02-03 08:11:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 16:12:23 +0000 |
| commit | ad20c4eb6b6a1cf095f7af93a3bddb16adf1f54b (patch) | |
| tree | 69016b8e3dbfc10e5641084c27abc152fe36fecb /ios/chrome/browser/history | |
| parent | f836852278a068c37ee01960fb2d681190ac1c64 (diff) | |
| download | chromium_src-ad20c4eb6b6a1cf095f7af93a3bddb16adf1f54b.zip chromium_src-ad20c4eb6b6a1cf095f7af93a3bddb16adf1f54b.tar.gz chromium_src-ad20c4eb6b6a1cf095f7af93a3bddb16adf1f54b.tar.bz2 | |
Move chrome_browser_state.{cc,h} to ios/chrome/browser/browser_state.
In preparation of upstreaming the implementation of ChromeBrowserState,
move the code to ios/chrome/browser/browser_state.
Leave a forwarding header to avoid breaking downstream at next merge.
BUG=None
Review URL: https://codereview.chromium.org/1667733002
Cr-Commit-Position: refs/heads/master@{#373249}
Diffstat (limited to 'ios/chrome/browser/history')
| -rw-r--r-- | ios/chrome/browser/history/history_service_factory.cc | 2 | ||||
| -rw-r--r-- | ios/chrome/browser/history/top_sites_factory.cc | 2 | ||||
| -rw-r--r-- | ios/chrome/browser/history/web_history_service_factory.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ios/chrome/browser/history/history_service_factory.cc b/ios/chrome/browser/history/history_service_factory.cc index ea07537..c511029 100644 --- a/ios/chrome/browser/history/history_service_factory.cc +++ b/ios/chrome/browser/history/history_service_factory.cc @@ -16,9 +16,9 @@ #include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" +#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/history/history_client_impl.h" #include "ios/chrome/browser/pref_names.h" -#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" namespace ios { diff --git a/ios/chrome/browser/history/top_sites_factory.cc b/ios/chrome/browser/history/top_sites_factory.cc index 36d73f9..d2a80b7 100644 --- a/ios/chrome/browser/history/top_sites_factory.cc +++ b/ios/chrome/browser/history/top_sites_factory.cc @@ -11,9 +11,9 @@ #include "components/keyed_service/core/service_access_type.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/history/history_service_factory.h" #include "ios/chrome/browser/history/history_utils.h" -#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/web/public/web_thread.h" namespace ios { diff --git a/ios/chrome/browser/history/web_history_service_factory.cc b/ios/chrome/browser/history/web_history_service_factory.cc index 322dcd5..9211fc6 100644 --- a/ios/chrome/browser/history/web_history_service_factory.cc +++ b/ios/chrome/browser/history/web_history_service_factory.cc @@ -12,10 +12,10 @@ #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/sync_service.h" +#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" #include "ios/chrome/browser/signin/signin_manager_factory.h" #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h" -#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" #include "net/url_request/url_request_context_getter.h" namespace ios { |