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

Unified Diff: webkit/common/webdropdata.h

Issue 16415016: Move nullable_string16.h to the string subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar Created 7 years, 6 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 | « webkit/common/dom_storage/dom_storage_types.h ('k') | webkit/common/webdropdata.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/common/webdropdata.h
diff --git a/webkit/common/webdropdata.h b/webkit/common/webdropdata.h
index 1e32f56acfb258239bd33d4736d94907e178d03d..c36d9185ddb35d798b1dbc66c77f4d76ccfeb71a 100644
--- a/webkit/common/webdropdata.h
+++ b/webkit/common/webdropdata.h
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include "base/nullable_string16.h"
+#include "base/strings/nullable_string16.h"
#include "base/strings/string16.h"
#include "googleurl/src/gurl.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
@@ -62,12 +62,12 @@ struct WEBKIT_COMMON_EXPORT WebDropData {
base::string16 filesystem_id;
// User is dragging plain text into the webview.
- NullableString16 text;
+ base::NullableString16 text;
// User is dragging text/html into the webview (e.g., out of Firefox).
// |html_base_url| is the URL that the html fragment is taken from (used to
// resolve relative links). It's ok for |html_base_url| to be empty.
- NullableString16 html;
+ base::NullableString16 html;
GURL html_base_url;
// User is dragging data from the webview (e.g., an image).
« no previous file with comments | « webkit/common/dom_storage/dom_storage_types.h ('k') | webkit/common/webdropdata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698