| 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" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #include "chrome/browser/ui/extensions/application_launch.h" | 48 #include "chrome/browser/ui/extensions/application_launch.h" |
| 49 #include "chrome/browser/ui/host_desktop.h" | 49 #include "chrome/browser/ui/host_desktop.h" |
| 50 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 50 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 51 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 51 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 52 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 52 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 53 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 53 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 54 #include "chrome/common/chrome_switches.h" | 54 #include "chrome/common/chrome_switches.h" |
| 55 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 55 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 56 #include "chrome/common/pref_names.h" | 56 #include "chrome/common/pref_names.h" |
| 57 #include "chrome/common/url_constants.h" | 57 #include "chrome/common/url_constants.h" |
| 58 #include "chrome/grit/chromium_strings.h" |
| 59 #include "chrome/grit/generated_resources.h" |
| 58 #include "chrome/test/base/in_process_browser_test.h" | 60 #include "chrome/test/base/in_process_browser_test.h" |
| 59 #include "chrome/test/base/test_switches.h" | 61 #include "chrome/test/base/test_switches.h" |
| 60 #include "chrome/test/base/ui_test_utils.h" | 62 #include "chrome/test/base/ui_test_utils.h" |
| 61 #include "components/translate/core/browser/language_state.h" | 63 #include "components/translate/core/browser/language_state.h" |
| 62 #include "components/translate/core/common/language_detection_details.h" | 64 #include "components/translate/core/common/language_detection_details.h" |
| 63 #include "content/public/browser/favicon_status.h" | 65 #include "content/public/browser/favicon_status.h" |
| 64 #include "content/public/browser/host_zoom_map.h" | 66 #include "content/public/browser/host_zoom_map.h" |
| 65 #include "content/public/browser/interstitial_page.h" | 67 #include "content/public/browser/interstitial_page.h" |
| 66 #include "content/public/browser/interstitial_page_delegate.h" | 68 #include "content/public/browser/interstitial_page_delegate.h" |
| 67 #include "content/public/browser/navigation_entry.h" | 69 #include "content/public/browser/navigation_entry.h" |
| 68 #include "content/public/browser/notification_service.h" | 70 #include "content/public/browser/notification_service.h" |
| 69 #include "content/public/browser/render_frame_host.h" | 71 #include "content/public/browser/render_frame_host.h" |
| 70 #include "content/public/browser/render_process_host.h" | 72 #include "content/public/browser/render_process_host.h" |
| 71 #include "content/public/browser/render_view_host.h" | 73 #include "content/public/browser/render_view_host.h" |
| 72 #include "content/public/browser/render_widget_host_view.h" | 74 #include "content/public/browser/render_widget_host_view.h" |
| 73 #include "content/public/browser/resource_context.h" | 75 #include "content/public/browser/resource_context.h" |
| 74 #include "content/public/browser/web_contents.h" | 76 #include "content/public/browser/web_contents.h" |
| 75 #include "content/public/browser/web_contents_observer.h" | 77 #include "content/public/browser/web_contents_observer.h" |
| 76 #include "content/public/common/frame_navigate_params.h" | 78 #include "content/public/common/frame_navigate_params.h" |
| 77 #include "content/public/common/page_transition_types.h" | 79 #include "content/public/common/page_transition_types.h" |
| 78 #include "content/public/common/renderer_preferences.h" | 80 #include "content/public/common/renderer_preferences.h" |
| 79 #include "content/public/common/url_constants.h" | 81 #include "content/public/common/url_constants.h" |
| 80 #include "content/public/test/browser_test_utils.h" | 82 #include "content/public/test/browser_test_utils.h" |
| 81 #include "content/public/test/test_navigation_observer.h" | 83 #include "content/public/test/test_navigation_observer.h" |
| 82 #include "extensions/browser/extension_system.h" | 84 #include "extensions/browser/extension_system.h" |
| 83 #include "extensions/browser/uninstall_reason.h" | 85 #include "extensions/browser/uninstall_reason.h" |
| 84 #include "extensions/common/extension.h" | 86 #include "extensions/common/extension.h" |
| 85 #include "extensions/common/extension_set.h" | 87 #include "extensions/common/extension_set.h" |
| 86 #include "grit/chromium_strings.h" | |
| 87 #include "grit/generated_resources.h" | |
| 88 #include "net/dns/mock_host_resolver.h" | 88 #include "net/dns/mock_host_resolver.h" |
| 89 #include "net/test/spawned_test_server/spawned_test_server.h" | 89 #include "net/test/spawned_test_server/spawned_test_server.h" |
| 90 #include "ui/base/l10n/l10n_util.h" | 90 #include "ui/base/l10n/l10n_util.h" |
| 91 | 91 |
| 92 #if defined(OS_MACOSX) | 92 #if defined(OS_MACOSX) |
| 93 #include "base/mac/mac_util.h" | 93 #include "base/mac/mac_util.h" |
| 94 #include "base/mac/scoped_nsautorelease_pool.h" | 94 #include "base/mac/scoped_nsautorelease_pool.h" |
| 95 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 95 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
| 96 #endif | 96 #endif |
| 97 | 97 |
| (...skipping 2624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2722 #endif | 2722 #endif |
| 2723 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2723 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
| 2724 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2724 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
| 2725 gfx::Size exp_final_size(initial_wcv_size); | 2725 gfx::Size exp_final_size(initial_wcv_size); |
| 2726 exp_final_size.Enlarge(wcv_resize_insets.width(), | 2726 exp_final_size.Enlarge(wcv_resize_insets.width(), |
| 2727 wcv_resize_insets.height() + height_inset); | 2727 wcv_resize_insets.height() + height_inset); |
| 2728 EXPECT_EQ(exp_final_size, | 2728 EXPECT_EQ(exp_final_size, |
| 2729 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2729 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
| 2730 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); | 2730 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); |
| 2731 } | 2731 } |
| OLD | NEW |