Chromium Code Reviews| Index: ios/web_view/internal/cwv_website_data_store.mm |
| diff --git a/ios/web_view/internal/cwv_website_data_store.mm b/ios/web_view/internal/cwv_website_data_store.mm |
| index 520da839af44cf27c5ce65cd59eb07047c2b17a6..df1c3b3e87a2e1ac596e95869ed26bb512a421b6 100644 |
| --- a/ios/web_view/internal/cwv_website_data_store.mm |
| +++ b/ios/web_view/internal/cwv_website_data_store.mm |
| @@ -6,8 +6,8 @@ |
| #include <memory.h> |
| -#include "ios/web_view/internal/criwv_browser_state.h" |
| -#import "ios/web_view/internal/criwv_web_client.h" |
| +#include "ios/web_view/internal/web_view_browser_state.h" |
| +#import "ios/web_view/internal/web_view_web_client.h" |
| #if !defined(__has_feature) || !__has_feature(objc_arc) |
| #error "This file requires ARC support." |
| @@ -15,26 +15,26 @@ |
| @implementation CWVWebsiteDataStore |
| // TODO(crbug.com/690182): CWVWebsiteDataStore should own _browserState. |
| -ios_web_view::CRIWVBrowserState* _browserState; |
| +ios_web_view::WebViewBrowserState* _browserState; |
|
Eugene But (OOO till 7-30)
2017/02/25 01:29:28
I missed this earlier, but without braces |_browse
michaeldo
2017/02/25 07:41:11
Acknowledged.
|
| - (BOOL)isPersistent { |
| return !_browserState->IsOffTheRecord(); |
| } |
| -- (ios_web_view::CRIWVBrowserState*)browserState { |
| +- (ios_web_view::WebViewBrowserState*)browserState { |
| return _browserState; |
| } |
| - (void)setBrowserState: |
| - (ios_web_view::CRIWVBrowserState* _Nonnull)browserState { |
| + (ios_web_view::WebViewBrowserState* _Nonnull)browserState { |
| _browserState = browserState; |
| } |
| + (instancetype)defaultDataStore { |
| CWVWebsiteDataStore* dataStore = [[CWVWebsiteDataStore alloc] init]; |
| - ios_web_view::CRIWVWebClient* client = |
| - static_cast<ios_web_view::CRIWVWebClient*>(web::GetWebClient()); |
| + ios_web_view::WebViewWebClient* client = |
| + static_cast<ios_web_view::WebViewWebClient*>(web::GetWebClient()); |
| [dataStore setBrowserState:client->browser_state()]; |
| return dataStore; |
| @@ -43,8 +43,8 @@ ios_web_view::CRIWVBrowserState* _browserState; |
| + (instancetype)nonPersistentDataStore { |
| CWVWebsiteDataStore* dataStore = [[CWVWebsiteDataStore alloc] init]; |
| - ios_web_view::CRIWVWebClient* client = |
| - static_cast<ios_web_view::CRIWVWebClient*>(web::GetWebClient()); |
| + ios_web_view::WebViewWebClient* client = |
| + static_cast<ios_web_view::WebViewWebClient*>(web::GetWebClient()); |
| [dataStore setBrowserState:client->off_the_record_browser_state()]; |
| return dataStore; |