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

Side by Side Diff: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "base/file_path.h" 5 #include "base/file_path.h"
6 #include "chrome/app/chrome_command_ids.h" 6 #include "chrome/app/chrome_command_ids.h"
7 #include "chrome/browser/ui/view_ids.h" 7 #include "chrome/browser/ui/view_ids.h"
8 #include "chrome/test/automation/automation_proxy.h" 8 #include "chrome/test/automation/automation_proxy.h"
9 #include "chrome/test/automation/browser_proxy.h" 9 #include "chrome/test/automation/browser_proxy.h"
10 #include "chrome/test/automation/tab_proxy.h" 10 #include "chrome/test/automation/tab_proxy.h"
11 #include "chrome/test/automation/window_proxy.h" 11 #include "chrome/test/automation/window_proxy.h"
12 #include "chrome/test/ui/ui_test.h" 12 #include "chrome/test/ui/ui_test.h"
13 #include "chrome/test/ui_test_utils.h" 13 #include "chrome/test/ui_test_utils.h"
14 #include "gfx/rect.h"
15 #include "ui/base/message_box_flags.h" 14 #include "ui/base/message_box_flags.h"
15 #include "ui/gfx/rect.h"
16 #include "views/event.h" 16 #include "views/event.h"
17 17
18 class FastShutdown : public UITest { 18 class FastShutdown : public UITest {
19 }; 19 };
20 20
21 #if defined(OS_MACOSX) 21 #if defined(OS_MACOSX)
22 // SimulateOSClick is broken on the Mac: http://crbug.com/45162 22 // SimulateOSClick is broken on the Mac: http://crbug.com/45162
23 #define MAYBE_SlowTermination DISABLED_SlowTermination 23 #define MAYBE_SlowTermination DISABLED_SlowTermination
24 #else 24 #else
25 #define MAYBE_SlowTermination SlowTermination 25 #define MAYBE_SlowTermination SlowTermination
(...skipping 24 matching lines...) Expand all
50 50
51 // Close the browser. We should launch the unload handler, which is an 51 // Close the browser. We should launch the unload handler, which is an
52 // alert(). 52 // alert().
53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW)); 53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));
54 ASSERT_TRUE(automation()->WaitForAppModalDialog()); 54 ASSERT_TRUE(automation()->WaitForAppModalDialog());
55 ASSERT_TRUE(automation()->ClickAppModalDialogButton( 55 ASSERT_TRUE(automation()->ClickAppModalDialogButton(
56 ui::MessageBoxFlags::DIALOGBUTTON_OK)); 56 ui::MessageBoxFlags::DIALOGBUTTON_OK));
57 ASSERT_TRUE(WaitForBrowserProcessToQuit( 57 ASSERT_TRUE(WaitForBrowserProcessToQuit(
58 TestTimeouts::wait_for_terminate_timeout_ms())); 58 TestTimeouts::wait_for_terminate_timeout_ms()));
59 } 59 }
OLDNEW
« no previous file with comments | « chrome/test/gpu/gpu_pixel_browsertest.cc ('k') | chrome/test/interactive_ui/mouseleave_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698