Index: win8/metro_driver/secondary_tile.cc |
diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc |
index 97ff63d1f7f584ce556077f5eb6f7d88d1d6622a..d892199b8d6abddb2c8ea755319d9e60e4c6e0b9 100644 |
--- a/win8/metro_driver/secondary_tile.cc |
+++ b/win8/metro_driver/secondary_tile.cc |
@@ -89,7 +89,7 @@ HRESULT TileRequestCompleter::Respond(winfoundtn::IAsyncOperation<bool>* async, |
return S_OK; |
} |
-void DeleteTileFromStartScreen(const string16& tile_id, |
+void DeleteTileFromStartScreen(const base::string16& tile_id, |
const MetroPinUmaResultCallback& callback) { |
DVLOG(1) << __FUNCTION__; |
mswr::ComPtr<winui::StartScreen::ISecondaryTileFactory> tile_factory; |
@@ -121,9 +121,9 @@ void DeleteTileFromStartScreen(const string16& tile_id, |
completer->Complete(completion); |
} |
-void CreateTileOnStartScreen(const string16& tile_id, |
- const string16& title_str, |
- const string16& url_str, |
+void CreateTileOnStartScreen(const base::string16& tile_id, |
+ const base::string16& title_str, |
+ const base::string16& url_str, |
const base::FilePath& logo_path, |
const MetroPinUmaResultCallback& callback) { |
VLOG(1) << __FUNCTION__; |
@@ -156,7 +156,8 @@ void CreateTileOnStartScreen(const string16& tile_id, |
CheckHR(hr, "Failed to create URIFactory"); |
mswrw::HString logo_url; |
- logo_url.Attach(MakeHString(string16(L"file:///").append(logo_path.value()))); |
+ logo_url.Attach( |
+ MakeHString(base::string16(L"file:///").append(logo_path.value()))); |
mswr::ComPtr<winfoundtn::IUriRuntimeClass> uri; |
hr = uri_factory->CreateUri(logo_url.Get(), &uri); |
CheckHR(hr, "Failed to create URI"); |
@@ -192,7 +193,7 @@ void CreateTileOnStartScreen(const string16& tile_id, |
} // namespace |
-BOOL MetroIsPinnedToStartScreen(const string16& tile_id) { |
+BOOL MetroIsPinnedToStartScreen(const base::string16& tile_id) { |
mswr::ComPtr<winui::StartScreen::ISecondaryTileStatics> tile_statics; |
HRESULT hr = winrt_utils::CreateActivationFactory( |
RuntimeClass_Windows_UI_StartScreen_SecondaryTile, |
@@ -205,7 +206,7 @@ BOOL MetroIsPinnedToStartScreen(const string16& tile_id) { |
return exists; |
} |
-void MetroUnPinFromStartScreen(const string16& tile_id, |
+void MetroUnPinFromStartScreen(const base::string16& tile_id, |
const MetroPinUmaResultCallback& callback) { |
globals.appview_msg_loop->PostTask( |
FROM_HERE, base::Bind(&DeleteTileFromStartScreen, |
@@ -213,9 +214,9 @@ void MetroUnPinFromStartScreen(const string16& tile_id, |
callback)); |
} |
-void MetroPinToStartScreen(const string16& tile_id, |
- const string16& title, |
- const string16& url, |
+void MetroPinToStartScreen(const base::string16& tile_id, |
+ const base::string16& title, |
+ const base::string16& url, |
const base::FilePath& logo_path, |
const MetroPinUmaResultCallback& callback) { |
globals.appview_msg_loop->PostTask( |