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

Side by Side Diff: chrome/test/ui_test_utils.cc

Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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 | « chrome/test/test_browser_window.h ('k') | chrome/test/ui_test_utils_linux.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) 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 "chrome/test/ui_test_utils.h" 5 #include "chrome/test/ui_test_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/process_util.h" 14 #include "base/process_util.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/automation/ui_controls.h" 17 #include "chrome/browser/automation/ui_controls.h"
18 #include "chrome/browser/browser.h"
19 #include "chrome/browser/browser_list.h" 18 #include "chrome/browser/browser_list.h"
20 #include "chrome/browser/browser_window.h" 19 #include "chrome/browser/browser_window.h"
21 #include "chrome/browser/dom_operation_notification_details.h" 20 #include "chrome/browser/dom_operation_notification_details.h"
22 #include "chrome/browser/download/download_item.h" 21 #include "chrome/browser/download/download_item.h"
23 #include "chrome/browser/download/download_manager.h" 22 #include "chrome/browser/download/download_manager.h"
24 #include "chrome/browser/profile.h" 23 #include "chrome/browser/profile.h"
25 #include "chrome/browser/renderer_host/render_process_host.h" 24 #include "chrome/browser/renderer_host/render_process_host.h"
26 #include "chrome/browser/renderer_host/render_view_host.h" 25 #include "chrome/browser/renderer_host/render_view_host.h"
27 #include "chrome/browser/tab_contents/navigation_controller.h" 26 #include "chrome/browser/tab_contents/navigation_controller.h"
28 #include "chrome/browser/tab_contents/navigation_entry.h" 27 #include "chrome/browser/tab_contents/navigation_entry.h"
29 #include "chrome/browser/tab_contents/tab_contents.h" 28 #include "chrome/browser/tab_contents/tab_contents.h"
29 #include "chrome/browser/ui/browser.h"
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/extensions/extension_action.h" 31 #include "chrome/common/extensions/extension_action.h"
32 #include "chrome/common/notification_type.h" 32 #include "chrome/common/notification_type.h"
33 #include "chrome/test/automation/javascript_execution_controller.h" 33 #include "chrome/test/automation/javascript_execution_controller.h"
34 #include "chrome/test/bookmark_load_observer.h" 34 #include "chrome/test/bookmark_load_observer.h"
35 #if defined(TOOLKIT_VIEWS) 35 #if defined(TOOLKIT_VIEWS)
36 #include "views/focus/accelerator_handler.h" 36 #include "views/focus/accelerator_handler.h"
37 #endif 37 #endif
38 #include "googleurl/src/gurl.h" 38 #include "googleurl/src/gurl.h"
39 #include "net/base/net_util.h" 39 #include "net/base/net_util.h"
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 if (waiting_for_ == source) { 794 if (waiting_for_ == source) {
795 seen_ = true; 795 seen_ = true;
796 if (running_) 796 if (running_)
797 MessageLoopForUI::current()->Quit(); 797 MessageLoopForUI::current()->Quit();
798 } else { 798 } else {
799 sources_seen_.insert(source.map_key()); 799 sources_seen_.insert(source.map_key());
800 } 800 }
801 } 801 }
802 802
803 } // namespace ui_test_utils 803 } // namespace ui_test_utils
OLDNEW
« no previous file with comments | « chrome/test/test_browser_window.h ('k') | chrome/test/ui_test_utils_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698