OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/sys_info.h" | 14 #include "base/sys_info.h" |
15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/browser/chrome_content_browser_client.h" | 16 #include "chrome/browser/chrome_content_browser_client.h" |
17 #include "chrome/browser/chrome_notification_types.h" | 17 #include "chrome/browser/chrome_notification_types.h" |
18 #include "chrome/browser/command_updater.h" | 18 #include "chrome/browser/command_updater.h" |
19 #include "chrome/browser/content_settings/host_content_settings_map.h" | |
20 #include "chrome/browser/defaults.h" | 19 #include "chrome/browser/defaults.h" |
21 #include "chrome/browser/devtools/devtools_window_testing.h" | 20 #include "chrome/browser/devtools/devtools_window_testing.h" |
22 #include "chrome/browser/extensions/extension_browsertest.h" | 21 #include "chrome/browser/extensions/extension_browsertest.h" |
23 #include "chrome/browser/extensions/extension_service.h" | 22 #include "chrome/browser/extensions/extension_service.h" |
24 #include "chrome/browser/extensions/tab_helper.h" | 23 #include "chrome/browser/extensions/tab_helper.h" |
25 #include "chrome/browser/first_run/first_run.h" | 24 #include "chrome/browser/first_run/first_run.h" |
26 #include "chrome/browser/lifetime/application_lifetime.h" | 25 #include "chrome/browser/lifetime/application_lifetime.h" |
27 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 26 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
28 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
29 #include "chrome/browser/profiles/profile_manager.h" | 28 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 23 matching lines...) Expand all Loading... |
53 #include "chrome/common/url_constants.h" | 52 #include "chrome/common/url_constants.h" |
54 #include "chrome/grit/chromium_strings.h" | 53 #include "chrome/grit/chromium_strings.h" |
55 #include "chrome/grit/generated_resources.h" | 54 #include "chrome/grit/generated_resources.h" |
56 #include "chrome/test/base/in_process_browser_test.h" | 55 #include "chrome/test/base/in_process_browser_test.h" |
57 #include "chrome/test/base/test_switches.h" | 56 #include "chrome/test/base/test_switches.h" |
58 #include "chrome/test/base/ui_test_utils.h" | 57 #include "chrome/test/base/ui_test_utils.h" |
59 #include "components/app_modal_dialogs/app_modal_dialog.h" | 58 #include "components/app_modal_dialogs/app_modal_dialog.h" |
60 #include "components/app_modal_dialogs/app_modal_dialog_queue.h" | 59 #include "components/app_modal_dialogs/app_modal_dialog_queue.h" |
61 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h" | 60 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h" |
62 #include "components/app_modal_dialogs/native_app_modal_dialog.h" | 61 #include "components/app_modal_dialogs/native_app_modal_dialog.h" |
| 62 #include "components/content_settings/core/browser/host_content_settings_map.h" |
63 #include "components/translate/core/browser/language_state.h" | 63 #include "components/translate/core/browser/language_state.h" |
64 #include "components/translate/core/common/language_detection_details.h" | 64 #include "components/translate/core/common/language_detection_details.h" |
65 #include "content/public/browser/favicon_status.h" | 65 #include "content/public/browser/favicon_status.h" |
66 #include "content/public/browser/host_zoom_map.h" | 66 #include "content/public/browser/host_zoom_map.h" |
67 #include "content/public/browser/interstitial_page.h" | 67 #include "content/public/browser/interstitial_page.h" |
68 #include "content/public/browser/interstitial_page_delegate.h" | 68 #include "content/public/browser/interstitial_page_delegate.h" |
69 #include "content/public/browser/navigation_entry.h" | 69 #include "content/public/browser/navigation_entry.h" |
70 #include "content/public/browser/notification_service.h" | 70 #include "content/public/browser/notification_service.h" |
71 #include "content/public/browser/render_frame_host.h" | 71 #include "content/public/browser/render_frame_host.h" |
72 #include "content/public/browser/render_process_host.h" | 72 #include "content/public/browser/render_process_host.h" |
(...skipping 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2641 #endif | 2641 #endif |
2642 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2642 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
2643 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2643 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
2644 gfx::Size exp_final_size(initial_wcv_size); | 2644 gfx::Size exp_final_size(initial_wcv_size); |
2645 exp_final_size.Enlarge(wcv_resize_insets.width(), | 2645 exp_final_size.Enlarge(wcv_resize_insets.width(), |
2646 wcv_resize_insets.height() + height_inset); | 2646 wcv_resize_insets.height() + height_inset); |
2647 EXPECT_EQ(exp_final_size, | 2647 EXPECT_EQ(exp_final_size, |
2648 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2648 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
2649 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); | 2649 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); |
2650 } | 2650 } |
OLD | NEW |