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" | 22 #include "chrome/browser/extensions/extension_system.h" |
23 #include "chrome/browser/extensions/tab_helper.h" | 23 #include "chrome/browser/extensions/tab_helper.h" |
24 #include "chrome/browser/first_run/first_run.h" | 24 #include "chrome/browser/first_run/first_run.h" |
25 #include "chrome/browser/lifetime/application_lifetime.h" | 25 #include "chrome/browser/lifetime/application_lifetime.h" |
26 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 26 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
27 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
28 #include "chrome/browser/profiles/profile_manager.h" | 28 #include "chrome/browser/profiles/profile_manager.h" |
| 29 #include "chrome/browser/search/search.h" |
29 #include "chrome/browser/sessions/session_backend.h" | 30 #include "chrome/browser/sessions/session_backend.h" |
30 #include "chrome/browser/sessions/session_service_factory.h" | 31 #include "chrome/browser/sessions/session_service_factory.h" |
31 #include "chrome/browser/translate/translate_tab_helper.h" | 32 #include "chrome/browser/translate/translate_tab_helper.h" |
32 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 33 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
33 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" | 34 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" |
34 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" | 35 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" |
35 #include "chrome/browser/ui/browser.h" | 36 #include "chrome/browser/ui/browser.h" |
36 #include "chrome/browser/ui/browser_command_controller.h" | 37 #include "chrome/browser/ui/browser_command_controller.h" |
37 #include "chrome/browser/ui/browser_commands.h" | 38 #include "chrome/browser/ui/browser_commands.h" |
38 #include "chrome/browser/ui/browser_finder.h" | 39 #include "chrome/browser/ui/browser_finder.h" |
(...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1286 // Make sure the state matches. | 1287 // Make sure the state matches. |
1287 TabStripModel* new_model = new_browser->tab_strip_model(); | 1288 TabStripModel* new_model = new_browser->tab_strip_model(); |
1288 EXPECT_TRUE(new_model->IsAppTab(0)); | 1289 EXPECT_TRUE(new_model->IsAppTab(0)); |
1289 EXPECT_FALSE(new_model->IsAppTab(1)); | 1290 EXPECT_FALSE(new_model->IsAppTab(1)); |
1290 EXPECT_FALSE(new_model->IsAppTab(2)); | 1291 EXPECT_FALSE(new_model->IsAppTab(2)); |
1291 | 1292 |
1292 EXPECT_TRUE(new_model->IsTabPinned(0)); | 1293 EXPECT_TRUE(new_model->IsTabPinned(0)); |
1293 EXPECT_TRUE(new_model->IsTabPinned(1)); | 1294 EXPECT_TRUE(new_model->IsTabPinned(1)); |
1294 EXPECT_FALSE(new_model->IsTabPinned(2)); | 1295 EXPECT_FALSE(new_model->IsTabPinned(2)); |
1295 | 1296 |
1296 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), | 1297 EXPECT_TRUE(chrome::IsNTPURL(new_model->GetWebContentsAt(2)->GetURL(), |
1297 new_model->GetWebContentsAt(2)->GetURL()); | 1298 browser()->profile())); |
1298 | 1299 |
1299 EXPECT_TRUE( | 1300 EXPECT_TRUE( |
1300 extensions::TabHelper::FromWebContents( | 1301 extensions::TabHelper::FromWebContents( |
1301 new_model->GetWebContentsAt(0))->extension_app() == extension_app); | 1302 new_model->GetWebContentsAt(0))->extension_app() == extension_app); |
1302 } | 1303 } |
1303 #endif // !defined(OS_CHROMEOS) | 1304 #endif // !defined(OS_CHROMEOS) |
1304 | 1305 |
1305 // This test verifies we don't crash when closing the last window and the app | 1306 // This test verifies we don't crash when closing the last window and the app |
1306 // menu is showing. | 1307 // menu is showing. |
1307 // TODO(linux_aura) http://crbug.com/163931 | 1308 // TODO(linux_aura) http://crbug.com/163931 |
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2414 exp_commit_size.Enlarge(wcv_resize_insets.width(), | 2415 exp_commit_size.Enlarge(wcv_resize_insets.width(), |
2415 wcv_resize_insets.height() + height_inset); | 2416 wcv_resize_insets.height() + height_inset); |
2416 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2417 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
2417 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2418 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
2418 // Sizes of RenderWidgetHostView and WebContentsView before and after | 2419 // Sizes of RenderWidgetHostView and WebContentsView before and after |
2419 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. | 2420 // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same. |
2420 EXPECT_EQ(rwhv_commit_size2, | 2421 EXPECT_EQ(rwhv_commit_size2, |
2421 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2422 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
2422 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); | 2423 EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize()); |
2423 } | 2424 } |
OLD | NEW |