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

Side by Side Diff: chrome/test/ui/ui_test.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (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
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/ui_test.h" 5 #include "chrome/test/ui/ui_test.h"
6 6
7 #if defined(OS_POSIX) 7 #if defined(OS_POSIX)
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #endif 10 #endif
(...skipping 10 matching lines...) Expand all
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/platform_thread.h" 22 #include "base/platform_thread.h"
23 #include "base/process_util.h" 23 #include "base/process_util.h"
24 #include "base/scoped_ptr.h" 24 #include "base/scoped_ptr.h"
25 #include "base/scoped_temp_dir.h" 25 #include "base/scoped_temp_dir.h"
26 #include "base/string_number_conversions.h" 26 #include "base/string_number_conversions.h"
27 #include "base/string_split.h" 27 #include "base/string_split.h"
28 #include "base/test/test_file_util.h" 28 #include "base/test/test_file_util.h"
29 #include "base/time.h" 29 #include "base/time.h"
30 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
31 #include "chrome/app/chrome_dll_resource.h" 31 #include "chrome/app/chrome_command_ids.h"
32 #include "chrome/browser/net/url_fixer_upper.h" 32 #include "chrome/browser/net/url_fixer_upper.h"
33 #include "chrome/common/chrome_constants.h" 33 #include "chrome/common/chrome_constants.h"
34 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/debug_flags.h" 36 #include "chrome/common/debug_flags.h"
37 #include "chrome/common/logging_chrome.h" 37 #include "chrome/common/logging_chrome.h"
38 #include "chrome/common/json_value_serializer.h" 38 #include "chrome/common/json_value_serializer.h"
39 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
40 #include "chrome/test/automation/automation_messages.h" 40 #include "chrome/test/automation/automation_messages.h"
41 #include "chrome/test/automation/automation_proxy.h" 41 #include "chrome/test/automation/automation_proxy.h"
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 bool visible = !wait_for_open; 1147 bool visible = !wait_for_open;
1148 if (!browser->IsShelfVisible(&visible)) 1148 if (!browser->IsShelfVisible(&visible))
1149 continue; 1149 continue;
1150 if (visible == wait_for_open) 1150 if (visible == wait_for_open)
1151 return true; // Got the download shelf. 1151 return true; // Got the download shelf.
1152 } 1152 }
1153 1153
1154 ADD_FAILURE() << "Timeout reached in WaitForDownloadShelfVisibilityChange"; 1154 ADD_FAILURE() << "Timeout reached in WaitForDownloadShelfVisibilityChange";
1155 return false; 1155 return false;
1156 } 1156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698