OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/gfx/point.h" | 5 #include "base/gfx/point.h" |
6 #include "base/gfx/rect.h" | 6 #include "base/gfx/rect.h" |
7 #include "chrome/app/chrome_dll_resource.h" | 7 #include "chrome/app/chrome_dll_resource.h" |
8 #include "chrome/browser/view_ids.h" | 8 #include "chrome/browser/view_ids.h" |
9 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" | 9 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" |
10 #include "chrome/test/automation/browser_proxy.h" | 10 #include "chrome/test/automation/browser_proxy.h" |
11 #include "chrome/test/automation/tab_proxy.h" | 11 #include "chrome/test/automation/tab_proxy.h" |
12 #include "chrome/test/automation/window_proxy.h" | 12 #include "chrome/test/automation/window_proxy.h" |
13 #include "chrome/test/ui/ui_test.h" | 13 #include "chrome/test/ui/ui_test.h" |
14 #include "views/event.h" | 14 #include "views/event.h" |
15 | 15 |
16 AutomatedUITestBase::AutomatedUITestBase() {} | 16 AutomatedUITestBase::AutomatedUITestBase() {} |
17 | 17 |
18 AutomatedUITestBase::~AutomatedUITestBase() {} | 18 AutomatedUITestBase::~AutomatedUITestBase() {} |
19 | 19 |
20 void AutomatedUITestBase::LogErrorMessage(const std::string& error) {} | 20 void AutomatedUITestBase::LogErrorMessage(const std::string& error) { |
| 21 } |
21 | 22 |
22 void AutomatedUITestBase::LogWarningMessage(const std::string& warning) { | 23 void AutomatedUITestBase::LogWarningMessage(const std::string& warning) { |
23 } | 24 } |
24 | 25 |
25 void AutomatedUITestBase::LogInfoMessage(const std::string& info) {} | 26 void AutomatedUITestBase::LogInfoMessage(const std::string& info) { |
| 27 } |
26 | 28 |
27 void AutomatedUITestBase::SetUp() { | 29 void AutomatedUITestBase::SetUp() { |
28 UITest::SetUp(); | 30 UITest::SetUp(); |
29 set_active_browser(automation()->GetBrowserWindow(0)); | 31 set_active_browser(automation()->GetBrowserWindow(0)); |
30 } | 32 } |
31 | 33 |
32 bool AutomatedUITestBase::BackButton() { | 34 bool AutomatedUITestBase::BackButton() { |
33 return RunCommand(IDC_BACK); | 35 return RunCommand(IDC_BACK); |
34 } | 36 } |
35 | 37 |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 BrowserProxy* browser) { | 409 BrowserProxy* browser) { |
408 bool did_timeout; | 410 bool did_timeout; |
409 if (!browser->BringToFrontWithTimeout(action_max_timeout_ms(), | 411 if (!browser->BringToFrontWithTimeout(action_max_timeout_ms(), |
410 &did_timeout)) { | 412 &did_timeout)) { |
411 LogWarningMessage("failed_to_bring_window_to_front"); | 413 LogWarningMessage("failed_to_bring_window_to_front"); |
412 return NULL; | 414 return NULL; |
413 } | 415 } |
414 | 416 |
415 return browser->GetWindow(); | 417 return browser->GetWindow(); |
416 } | 418 } |
OLD | NEW |