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/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
13 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
14 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
15 #include "chrome/browser/chrome_content_browser_client.h" | 15 #include "chrome/browser/chrome_content_browser_client.h" |
16 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
17 #include "chrome/browser/command_updater.h" | 17 #include "chrome/browser/command_updater.h" |
18 #include "chrome/browser/content_settings/host_content_settings_map.h" | 18 #include "chrome/browser/content_settings/host_content_settings_map.h" |
19 #include "chrome/browser/defaults.h" | 19 #include "chrome/browser/defaults.h" |
20 #include "chrome/browser/extensions/extension_browsertest.h" | 20 #include "chrome/browser/extensions/extension_browsertest.h" |
21 #include "chrome/browser/extensions/extension_service.h" | 21 #include "chrome/browser/extensions/extension_service.h" |
22 #include "chrome/browser/extensions/extension_system.h" | |
23 #include "chrome/browser/extensions/tab_helper.h" | 22 #include "chrome/browser/extensions/tab_helper.h" |
24 #include "chrome/browser/first_run/first_run.h" | 23 #include "chrome/browser/first_run/first_run.h" |
25 #include "chrome/browser/lifetime/application_lifetime.h" | 24 #include "chrome/browser/lifetime/application_lifetime.h" |
26 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 25 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
27 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" |
28 #include "chrome/browser/profiles/profile_manager.h" | 27 #include "chrome/browser/profiles/profile_manager.h" |
29 #include "chrome/browser/sessions/session_backend.h" | 28 #include "chrome/browser/sessions/session_backend.h" |
30 #include "chrome/browser/sessions/session_service_factory.h" | 29 #include "chrome/browser/sessions/session_service_factory.h" |
31 #include "chrome/browser/translate/translate_tab_helper.h" | 30 #include "chrome/browser/translate/translate_tab_helper.h" |
32 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 31 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 #include "content/public/browser/resource_context.h" | 66 #include "content/public/browser/resource_context.h" |
68 #include "content/public/browser/web_contents.h" | 67 #include "content/public/browser/web_contents.h" |
69 #include "content/public/browser/web_contents_observer.h" | 68 #include "content/public/browser/web_contents_observer.h" |
70 #include "content/public/browser/web_contents_view.h" | 69 #include "content/public/browser/web_contents_view.h" |
71 #include "content/public/common/frame_navigate_params.h" | 70 #include "content/public/common/frame_navigate_params.h" |
72 #include "content/public/common/page_transition_types.h" | 71 #include "content/public/common/page_transition_types.h" |
73 #include "content/public/common/renderer_preferences.h" | 72 #include "content/public/common/renderer_preferences.h" |
74 #include "content/public/common/url_constants.h" | 73 #include "content/public/common/url_constants.h" |
75 #include "content/public/test/browser_test_utils.h" | 74 #include "content/public/test/browser_test_utils.h" |
76 #include "content/public/test/test_navigation_observer.h" | 75 #include "content/public/test/test_navigation_observer.h" |
| 76 #include "extensions/browser/extension_system.h" |
77 #include "extensions/common/extension.h" | 77 #include "extensions/common/extension.h" |
78 #include "extensions/common/extension_set.h" | 78 #include "extensions/common/extension_set.h" |
79 #include "grit/chromium_strings.h" | 79 #include "grit/chromium_strings.h" |
80 #include "grit/generated_resources.h" | 80 #include "grit/generated_resources.h" |
81 #include "net/dns/mock_host_resolver.h" | 81 #include "net/dns/mock_host_resolver.h" |
82 #include "net/test/spawned_test_server/spawned_test_server.h" | 82 #include "net/test/spawned_test_server/spawned_test_server.h" |
83 #include "ui/base/l10n/l10n_util.h" | 83 #include "ui/base/l10n/l10n_util.h" |
84 | 84 |
85 #if defined(OS_MACOSX) | 85 #if defined(OS_MACOSX) |
86 #include "base/mac/mac_util.h" | 86 #include "base/mac/mac_util.h" |
(...skipping 2469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2556 exp_commit_size.Enlarge(wcv_resize_insets.width(), | 2556 exp_commit_size.Enlarge(wcv_resize_insets.width(), |
2557 wcv_resize_insets.height() + height_inset); | 2557 wcv_resize_insets.height() + height_inset); |
2558 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2558 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
2559 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2559 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
2560 // Sizes of RenderWidgetHostView and WebContentsView before and after | 2560 // Sizes of RenderWidgetHostView and WebContentsView before and after |
2561 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. | 2561 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. |
2562 EXPECT_EQ(rwhv_commit_size2, | 2562 EXPECT_EQ(rwhv_commit_size2, |
2563 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2563 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
2564 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); | 2564 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); |
2565 } | 2565 } |
OLD | NEW |