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

Unified Diff: win8/metro_driver/toast_notification_handler.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/metro_driver/toast_notification_handler.h ('k') | win8/metro_driver/winrt_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/metro_driver/toast_notification_handler.cc
diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc
index ab014d4ff06f22a0fe123a57e7ea8f8b306ede4f..fb44b11dc2cc3a2a09e29ca942468502e59d715d 100644
--- a/win8/metro_driver/toast_notification_handler.cc
+++ b/win8/metro_driver/toast_notification_handler.cc
@@ -64,7 +64,7 @@ HRESULT GetTextNodeRoot(
// The index parameter identifies which text node we append to.
HRESULT CreateTextNode(winxml::Dom::IXmlDocument* xml_doc,
int index,
- const string16& text_string) {
+ const base::string16& text_string) {
DCHECK(xml_doc);
mswr::ComPtr<winxml::Dom::IXmlElement> document_element;
@@ -206,7 +206,8 @@ void ToastNotificationHandler::DisplayNotification(
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
bool is_per_user_install = InstallUtil::IsPerUserInstall(
chrome_path.value().c_str());
- string16 appid = ShellUtil::GetBrowserModelId(dist, is_per_user_install);
+ base::string16 appid =
+ ShellUtil::GetBrowserModelId(dist, is_per_user_install);
DVLOG(1) << "Chrome Appid is " << appid.c_str();
mswrw::HString app_user_model_id;
« no previous file with comments | « win8/metro_driver/toast_notification_handler.h ('k') | win8/metro_driver/winrt_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698