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

Unified Diff: win8/metro_driver/chrome_app_view.h

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/delegate_execute/delegate_execute_util_unittest.cc ('k') | win8/metro_driver/chrome_app_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/metro_driver/chrome_app_view.h
diff --git a/win8/metro_driver/chrome_app_view.h b/win8/metro_driver/chrome_app_view.h
index 0554ab31366860c7ea4a1e941c67b5278ca8673a..77d67815924bf098ae5d826ddd5ce86e7e89c6c5 100644
--- a/win8/metro_driver/chrome_app_view.h
+++ b/win8/metro_driver/chrome_app_view.h
@@ -155,8 +155,8 @@ struct Globals {
HANDLE host_thread;
ChromeAppView* view;
WNDPROC g_core_proc;
- string16 navigation_url;
- string16 search_string;
+ base::string16 navigation_url;
+ base::string16 search_string;
winapp::Activation::ApplicationExecutionState previous_state;
winapp::Activation::ActivationKind initial_activation_kind;
bool is_initial_activation;
@@ -164,7 +164,7 @@ struct Globals {
// to be initiated from that thread, notably spawning file pickers.
base::MessageLoopProxy* appview_msg_loop;
winapp::Core::ICoreApplicationExit* app_exit;
- string16 metro_command_line_switches;
+ base::string16 metro_command_line_switches;
};
extern Globals globals;
« no previous file with comments | « win8/delegate_execute/delegate_execute_util_unittest.cc ('k') | win8/metro_driver/chrome_app_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698