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

Side by Side Diff: chrome/browser/printing/print_dialog_cloud_interative_uitest.cc

Issue 10538039: Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update copyrights Created 8 years, 6 months 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
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 "chrome/browser/printing/print_dialog_cloud.h" 5 #include "chrome/browser/printing/print_dialog_cloud.h"
6 #include "chrome/browser/printing/print_dialog_cloud_internal.h" 6 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
7 7
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 CreateDialogForTest(); 202 CreateDialogForTest();
203 } 203 }
204 204
205 void CreateDialogForTest() { 205 void CreateDialogForTest() {
206 FilePath path_to_pdf = 206 FilePath path_to_pdf =
207 test_data_directory_.AppendASCII("printing/cloud_print_uitest.pdf"); 207 test_data_directory_.AppendASCII("printing/cloud_print_uitest.pdf");
208 BrowserThread::PostTask( 208 BrowserThread::PostTask(
209 BrowserThread::UI, FROM_HERE, 209 BrowserThread::UI, FROM_HERE,
210 base::Bind(&internal_cloud_print_helpers::CreateDialogFullImpl, 210 base::Bind(&internal_cloud_print_helpers::CreateDialogFullImpl,
211 browser()->profile(), browser()->window()->GetNativeHandle(), 211 browser()->profile(), browser()->window()->GetNativeWindow(),
212 path_to_pdf, string16(), string16(), 212 path_to_pdf, string16(), string16(),
213 std::string("application/pdf"), false)); 213 std::string("application/pdf"), false));
214 } 214 }
215 215
216 bool handler_added_; 216 bool handler_added_;
217 std::string scheme_; 217 std::string scheme_;
218 std::string host_name_; 218 std::string host_name_;
219 FilePath test_data_directory_; 219 FilePath test_data_directory_;
220 AutoQuitDelegate delegate_; 220 AutoQuitDelegate delegate_;
221 }; 221 };
(...skipping 29 matching lines...) Expand all
251 // Close the dialog before finishing the test. 251 // Close the dialog before finishing the test.
252 ui_test_utils::WindowedNotificationObserver tab_closed_observer( 252 ui_test_utils::WindowedNotificationObserver tab_closed_observer(
253 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, 253 content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
254 content::NotificationService::AllSources()); 254 content::NotificationService::AllSources());
255 255
256 // Can't use ui_test_utils::SendKeyPressSync or 256 // Can't use ui_test_utils::SendKeyPressSync or
257 // ui_test_utils::SendKeyPressAndWait due to a race condition with closing 257 // ui_test_utils::SendKeyPressAndWait due to a race condition with closing
258 // the window. See http://crbug.com/111269 258 // the window. See http://crbug.com/111269
259 BrowserWindow* window = browser()->window(); 259 BrowserWindow* window = browser()->window();
260 ASSERT_TRUE(window); 260 ASSERT_TRUE(window);
261 gfx::NativeWindow native_window = window->GetNativeHandle(); 261 gfx::NativeWindow native_window = window->GetNativeWindow();
262 ASSERT_TRUE(native_window); 262 ASSERT_TRUE(native_window);
263 bool key_sent = ui_controls::SendKeyPress(native_window, ui::VKEY_ESCAPE, 263 bool key_sent = ui_controls::SendKeyPress(native_window, ui::VKEY_ESCAPE,
264 false, false, false, false); 264 false, false, false, false);
265 EXPECT_TRUE(key_sent); 265 EXPECT_TRUE(key_sent);
266 if (key_sent) 266 if (key_sent)
267 tab_closed_observer.Wait(); 267 tab_closed_observer.Wait();
268 } 268 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698