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

Unified Diff: ios/web_view/internal/cwv_web_view.mm

Issue 2747683002: Merge CWVWebsiteDataStore into CWVWebViewConfiguration. (Closed)
Patch Set: Apply review comments, rebase and merge. Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web_view/internal/cwv.mm ('k') | ios/web_view/internal/cwv_web_view_configuration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web_view/internal/cwv_web_view.mm
diff --git a/ios/web_view/internal/cwv_web_view.mm b/ios/web_view/internal/cwv_web_view.mm
index ff7c2d1e01182d1fec1f846744d6a9de1582f80c..6df0d2ac3845f06ea52ed5ef58bf542b43f1dcb7 100644
--- a/ios/web_view/internal/cwv_web_view.mm
+++ b/ios/web_view/internal/cwv_web_view.mm
@@ -20,7 +20,7 @@
#import "ios/web/public/web_state/web_state_delegate_bridge.h"
#import "ios/web/public/web_state/web_state_observer_bridge.h"
#import "ios/web_view/internal/cwv_html_element_internal.h"
-#import "ios/web_view/internal/cwv_website_data_store_internal.h"
+#import "ios/web_view/internal/cwv_web_view_configuration_internal.h"
#import "ios/web_view/internal/translate/web_view_translate_client.h"
#include "ios/web_view/internal/web_view_browser_state.h"
#import "ios/web_view/internal/web_view_java_script_dialog_presenter.h"
@@ -28,7 +28,6 @@
#import "ios/web_view/public/cwv_navigation_delegate.h"
#import "ios/web_view/public/cwv_ui_delegate.h"
#import "ios/web_view/public/cwv_web_view_configuration.h"
-#import "ios/web_view/public/cwv_website_data_store.h"
#import "net/base/mac/url_conversions.h"
#include "ui/base/page_transition_types.h"
#include "url/gurl.h"
@@ -66,7 +65,7 @@
_configuration = [configuration copy];
web::WebState::CreateParams webStateCreateParams(
- [configuration.websiteDataStore browserState]);
+ configuration.browserState);
_webState = web::WebState::Create(webStateCreateParams);
_webState->SetWebUsageEnabled(true);
« no previous file with comments | « ios/web_view/internal/cwv.mm ('k') | ios/web_view/internal/cwv_web_view_configuration.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698