diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:35:56 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:35:56 +0000 |
| commit | 4dcc2ec6b1a9417aab85183acbca64761ccdd32d (patch) | |
| tree | ec1ac02e939a76a038f3c47824a34c36fb2de90e /win8/metro_driver/secondary_tile.cc | |
| parent | fdd91ad2e68f187bc301c30ecda7e503dae32126 (diff) | |
| download | chromium_src-4dcc2ec6b1a9417aab85183acbca64761ccdd32d.zip chromium_src-4dcc2ec6b1a9417aab85183acbca64761ccdd32d.tar.gz chromium_src-4dcc2ec6b1a9417aab85183acbca64761ccdd32d.tar.bz2 | |
Add base:: to string16s in win8/.
R=grt@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/119733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/secondary_tile.cc')
| -rw-r--r-- | win8/metro_driver/secondary_tile.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc index 97ff63d1..d892199 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( |