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

Side by Side Diff: win8/metro_driver/chrome_app_view.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « win8/metro_driver/chrome_app_view.h ('k') | win8/metro_driver/chrome_app_view_ash.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "win8/metro_driver/stdafx.h" 5 #include "win8/metro_driver/stdafx.h"
6 #include "win8/metro_driver/chrome_app_view.h" 6 #include "win8/metro_driver/chrome_app_view.h"
7 7
8 #include <corewindow.h> 8 #include <corewindow.h>
9 #include <windows.applicationModel.datatransfer.h> 9 #include <windows.applicationModel.datatransfer.h>
10 #include <windows.foundation.h> 10 #include <windows.foundation.h>
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 &result)) { 1081 &result)) {
1082 VPLOG(1) << "Failed to retrieve tab info from chrome."; 1082 VPLOG(1) << "Failed to retrieve tab info from chrome.";
1083 return E_FAIL; 1083 return E_FAIL;
1084 } 1084 }
1085 1085
1086 if (!current_tab_info.title || !current_tab_info.url) { 1086 if (!current_tab_info.title || !current_tab_info.url) {
1087 DVLOG(1) << "Failed to retrieve tab info from chrome."; 1087 DVLOG(1) << "Failed to retrieve tab info from chrome.";
1088 return E_FAIL; 1088 return E_FAIL;
1089 } 1089 }
1090 1090
1091 string16 current_title(current_tab_info.title); 1091 base::string16 current_title(current_tab_info.title);
1092 string16 current_url(current_tab_info.url); 1092 base::string16 current_url(current_tab_info.url);
1093 1093
1094 LocalFree(current_tab_info.title); 1094 LocalFree(current_tab_info.title);
1095 LocalFree(current_tab_info.url); 1095 LocalFree(current_tab_info.url);
1096 1096
1097 mswr::ComPtr<winapp::DataTransfer::IDataPackagePropertySet> data_properties; 1097 mswr::ComPtr<winapp::DataTransfer::IDataPackagePropertySet> data_properties;
1098 hr = data_package->get_Properties(&data_properties); 1098 hr = data_package->get_Properties(&data_properties);
1099 1099
1100 mswrw::HString title; 1100 mswrw::HString title;
1101 title.Attach(MakeHString(current_title)); 1101 title.Attach(MakeHString(current_title));
1102 data_properties->put_Title(title.Get()); 1102 data_properties->put_Title(title.Get());
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 CheckHR(core_app.As(&app_exit)); 1207 CheckHR(core_app.As(&app_exit));
1208 globals.app_exit = app_exit.Detach(); 1208 globals.app_exit = app_exit.Detach();
1209 } 1209 }
1210 1210
1211 IFACEMETHODIMP 1211 IFACEMETHODIMP
1212 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) { 1212 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) {
1213 globals.view = mswr::Make<ChromeAppView>().Detach(); 1213 globals.view = mswr::Make<ChromeAppView>().Detach();
1214 *view = globals.view; 1214 *view = globals.view;
1215 return (*view) ? S_OK : E_OUTOFMEMORY; 1215 return (*view) ? S_OK : E_OUTOFMEMORY;
1216 } 1216 }
OLDNEW
« no previous file with comments | « win8/metro_driver/chrome_app_view.h ('k') | win8/metro_driver/chrome_app_view_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698