OLD | NEW |
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 "app/clipboard/clipboard.h" | 5 #include "app/clipboard/clipboard.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/browser_window.h" | |
13 #include "chrome/browser/renderer_host/render_view_host.h" | 12 #include "chrome/browser/renderer_host/render_view_host.h" |
14 #include "chrome/browser/tab_contents/tab_contents.h" | 13 #include "chrome/browser/tab_contents/tab_contents.h" |
15 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/window_sizer.h" | 15 #include "chrome/browser/ui/browser_window.h" |
| 16 #include "chrome/browser/ui/window_sizer.h" |
17 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/notification_observer.h" | 19 #include "chrome/common/notification_observer.h" |
20 #include "chrome/common/notification_type.h" | 20 #include "chrome/common/notification_type.h" |
21 #include "chrome/test/in_process_browser_test.h" | 21 #include "chrome/test/in_process_browser_test.h" |
22 #include "chrome/test/ui_test_utils.h" | 22 #include "chrome/test/ui_test_utils.h" |
23 #include "gfx/codec/png_codec.h" | 23 #include "gfx/codec/png_codec.h" |
24 #include "net/test/test_server.h" | 24 #include "net/test/test_server.h" |
25 | 25 |
26 extern base::hash_map<std::string, int> g_test_timeout_overrides; | 26 extern base::hash_map<std::string, int> g_test_timeout_overrides; |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 // Check if the LOAD_STOP notification could have come while we run a | 333 // Check if the LOAD_STOP notification could have come while we run a |
334 // nested message loop for the JS call. | 334 // nested message loop for the JS call. |
335 if (last_count != load_stop_notification_count()) | 335 if (last_count != load_stop_notification_count()) |
336 continue; | 336 continue; |
337 ui_test_utils::WaitForLoadStop(controller); | 337 ui_test_utils::WaitForLoadStop(controller); |
338 } | 338 } |
339 } | 339 } |
340 } | 340 } |
341 | 341 |
342 } // namespace | 342 } // namespace |
OLD | NEW |