OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/location.h" | 14 #include "base/location.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
17 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
18 #include "base/prefs/pref_service.h" | |
19 #include "base/strings/string_split.h" | 18 #include "base/strings/string_split.h" |
20 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
21 #include "base/sys_info.h" | 20 #include "base/sys_info.h" |
22 #include "build/build_config.h" | 21 #include "build/build_config.h" |
23 #include "chrome/app/chrome_command_ids.h" | 22 #include "chrome/app/chrome_command_ids.h" |
24 #include "chrome/browser/chrome_content_browser_client.h" | 23 #include "chrome/browser/chrome_content_browser_client.h" |
25 #include "chrome/browser/chrome_notification_types.h" | 24 #include "chrome/browser/chrome_notification_types.h" |
26 #include "chrome/browser/command_updater.h" | 25 #include "chrome/browser/command_updater.h" |
27 #include "chrome/browser/defaults.h" | 26 #include "chrome/browser/defaults.h" |
28 #include "chrome/browser/devtools/devtools_window_testing.h" | 27 #include "chrome/browser/devtools/devtools_window_testing.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 #include "chrome/grit/chromium_strings.h" | 65 #include "chrome/grit/chromium_strings.h" |
67 #include "chrome/grit/generated_resources.h" | 66 #include "chrome/grit/generated_resources.h" |
68 #include "chrome/test/base/in_process_browser_test.h" | 67 #include "chrome/test/base/in_process_browser_test.h" |
69 #include "chrome/test/base/test_switches.h" | 68 #include "chrome/test/base/test_switches.h" |
70 #include "chrome/test/base/ui_test_utils.h" | 69 #include "chrome/test/base/ui_test_utils.h" |
71 #include "components/app_modal/app_modal_dialog.h" | 70 #include "components/app_modal/app_modal_dialog.h" |
72 #include "components/app_modal/app_modal_dialog_queue.h" | 71 #include "components/app_modal/app_modal_dialog_queue.h" |
73 #include "components/app_modal/javascript_app_modal_dialog.h" | 72 #include "components/app_modal/javascript_app_modal_dialog.h" |
74 #include "components/app_modal/native_app_modal_dialog.h" | 73 #include "components/app_modal/native_app_modal_dialog.h" |
75 #include "components/content_settings/core/browser/host_content_settings_map.h" | 74 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 75 #include "components/prefs/pref_service.h" |
76 #include "components/sessions/core/base_session_service_test_helper.h" | 76 #include "components/sessions/core/base_session_service_test_helper.h" |
77 #include "components/translate/core/browser/language_state.h" | 77 #include "components/translate/core/browser/language_state.h" |
78 #include "components/translate/core/common/language_detection_details.h" | 78 #include "components/translate/core/common/language_detection_details.h" |
79 #include "content/public/browser/favicon_status.h" | 79 #include "content/public/browser/favicon_status.h" |
80 #include "content/public/browser/host_zoom_map.h" | 80 #include "content/public/browser/host_zoom_map.h" |
81 #include "content/public/browser/interstitial_page.h" | 81 #include "content/public/browser/interstitial_page.h" |
82 #include "content/public/browser/interstitial_page_delegate.h" | 82 #include "content/public/browser/interstitial_page_delegate.h" |
83 #include "content/public/browser/navigation_entry.h" | 83 #include "content/public/browser/navigation_entry.h" |
84 #include "content/public/browser/notification_service.h" | 84 #include "content/public/browser/notification_service.h" |
85 #include "content/public/browser/render_frame_host.h" | 85 #include "content/public/browser/render_frame_host.h" |
(...skipping 3228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3314 Browser* browser = new Browser(params); | 3314 Browser* browser = new Browser(params); |
3315 gfx::Rect bounds = browser->window()->GetBounds(); | 3315 gfx::Rect bounds = browser->window()->GetBounds(); |
3316 | 3316 |
3317 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 3317 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
3318 // See https://crbug.com/567925. | 3318 // See https://crbug.com/567925. |
3319 EXPECT_GE(bounds.width(), 100); | 3319 EXPECT_GE(bounds.width(), 100); |
3320 EXPECT_EQ(122, bounds.height()); | 3320 EXPECT_EQ(122, bounds.height()); |
3321 browser->window()->Close(); | 3321 browser->window()->Close(); |
3322 } | 3322 } |
3323 } | 3323 } |
OLD | NEW |