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

Side by Side Diff: win8/metro_driver/metro_dialog_box.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/metro_dialog_box.h ('k') | win8/metro_driver/metro_driver.cc » ('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 6
7 #include "win8/metro_driver/chrome_app_view.h" 7 #include "win8/metro_driver/chrome_app_view.h"
8 #include "win8/metro_driver/metro_dialog_box.h" 8 #include "win8/metro_driver/metro_dialog_box.h"
9 #include "win8/metro_driver/winrt_utils.h" 9 #include "win8/metro_driver/winrt_utils.h"
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 PostMessage(dialog_box, WM_CLOSE, 0, 0); 134 PostMessage(dialog_box, WM_CLOSE, 0, 0);
135 } 135 }
136 136
137 HRESULT STDMETHODCALLTYPE MetroDialogBox::Invoke( 137 HRESULT STDMETHODCALLTYPE MetroDialogBox::Invoke(
138 winui::Popups::IUICommand* command) { 138 winui::Popups::IUICommand* command) {
139 DVLOG(1) << __FUNCTION__; 139 DVLOG(1) << __FUNCTION__;
140 140
141 mswrw::HString label; 141 mswrw::HString label;
142 command->get_Label(label.GetAddressOf()); 142 command->get_Label(label.GetAddressOf());
143 143
144 string16 button_label = MakeStdWString(label.Get()); 144 base::string16 button_label = MakeStdWString(label.Get());
145 DVLOG(1) << "Clicked button label is : " << button_label; 145 DVLOG(1) << "Clicked button label is : " << button_label;
146 if (button_label == dialog_box_info_.button1_label) { 146 if (button_label == dialog_box_info_.button1_label) {
147 DVLOG(1) << "Button1 clicked"; 147 DVLOG(1) << "Button1 clicked";
148 DCHECK(dialog_box_info_.button1_handler); 148 DCHECK(dialog_box_info_.button1_handler);
149 dialog_box_info_.button1_handler(); 149 dialog_box_info_.button1_handler();
150 } else if (button_label == dialog_box_info_.button2_label) { 150 } else if (button_label == dialog_box_info_.button2_label) {
151 DVLOG(1) << "Button2 clicked"; 151 DVLOG(1) << "Button2 clicked";
152 DCHECK(dialog_box_info_.button2_handler); 152 DCHECK(dialog_box_info_.button2_handler);
153 dialog_box_info_.button2_handler(); 153 dialog_box_info_.button2_handler();
154 } 154 }
155 // The dialog box is destroyed once we return from invoke. Go ahead and 155 // The dialog box is destroyed once we return from invoke. Go ahead and
156 // dismiss it. 156 // dismiss it.
157 Dismiss(); 157 Dismiss();
158 return S_OK; 158 return S_OK;
159 } 159 }
160 160
OLDNEW
« no previous file with comments | « win8/metro_driver/metro_dialog_box.h ('k') | win8/metro_driver/metro_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698