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

Unified Diff: win8/test/open_with_dialog_async.cc

Issue 119733002: Add base:: to string16s in win8/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 | « win8/test/open_with_dialog_async.h ('k') | win8/test/open_with_dialog_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/test/open_with_dialog_async.cc
diff --git a/win8/test/open_with_dialog_async.cc b/win8/test/open_with_dialog_async.cc
index f491149766542543d3edeabaaa59e71eca158d56..2308b55235fed96462683ea5f7b799ae09d4ffc3 100644
--- a/win8/test/open_with_dialog_async.cc
+++ b/win8/test/open_with_dialog_async.cc
@@ -27,8 +27,8 @@ namespace {
struct OpenWithContext {
OpenWithContext(
HWND parent_window_in,
- const string16& file_name_in,
- const string16& file_type_class_in,
+ const base::string16& file_name_in,
+ const base::string16& file_type_class_in,
int open_as_info_flags_in,
const scoped_refptr<base::SingleThreadTaskRunner>& client_runner_in,
const OpenWithDialogCallback& callback_in);
@@ -36,8 +36,8 @@ struct OpenWithContext {
base::Thread thread;
HWND parent_window;
- string16 file_name;
- string16 file_type_class;
+ base::string16 file_name;
+ base::string16 file_type_class;
int open_as_info_flags;
scoped_refptr<base::SingleThreadTaskRunner> client_runner;
OpenWithDialogCallback callback;
@@ -45,8 +45,8 @@ struct OpenWithContext {
OpenWithContext::OpenWithContext(
HWND parent_window_in,
- const string16& file_name_in,
- const string16& file_type_class_in,
+ const base::string16& file_name_in,
+ const base::string16& file_type_class_in,
int open_as_info_flags_in,
const scoped_refptr<base::SingleThreadTaskRunner>& client_runner_in,
const OpenWithDialogCallback& callback_in)
@@ -104,8 +104,8 @@ void OpenWithDialogTask(OpenWithContext* context) {
void OpenWithDialogAsync(
HWND parent_window,
- const string16& file_name,
- const string16& file_type_class,
+ const base::string16& file_name,
+ const base::string16& file_type_class,
int open_as_info_flags,
const OpenWithDialogCallback& callback) {
DCHECK_GE(base::win::GetVersion(), base::win::VERSION_VISTA);
« no previous file with comments | « win8/test/open_with_dialog_async.h ('k') | win8/test/open_with_dialog_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698