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/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #if defined(OS_MACOSX) | 10 #if defined(OS_MACOSX) |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/extensions/extension_tab_helper.h" | 21 #include "chrome/browser/extensions/extension_tab_helper.h" |
22 #include "chrome/browser/first_run/first_run.h" | 22 #include "chrome/browser/first_run/first_run.h" |
23 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 23 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/profiles/profile_manager.h" | 25 #include "chrome/browser/profiles/profile_manager.h" |
26 #include "chrome/browser/translate/translate_tab_helper.h" | 26 #include "chrome/browser/translate/translate_tab_helper.h" |
27 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 27 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
28 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" | 28 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" |
29 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" | 29 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" |
30 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
| 31 #include "chrome/browser/ui/browser_command_controller.h" |
31 #include "chrome/browser/ui/browser_commands.h" | 32 #include "chrome/browser/ui/browser_commands.h" |
32 #include "chrome/browser/ui/browser_finder.h" | 33 #include "chrome/browser/ui/browser_finder.h" |
33 #include "chrome/browser/ui/browser_list.h" | 34 #include "chrome/browser/ui/browser_list.h" |
34 #include "chrome/browser/ui/browser_navigator.h" | 35 #include "chrome/browser/ui/browser_navigator.h" |
35 #include "chrome/browser/ui/browser_ui_prefs.h" | 36 #include "chrome/browser/ui/browser_ui_prefs.h" |
36 #include "chrome/browser/ui/browser_window.h" | 37 #include "chrome/browser/ui/browser_window.h" |
37 #include "chrome/browser/ui/extensions/application_launch.h" | 38 #include "chrome/browser/ui/extensions/application_launch.h" |
38 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 39 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
39 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 40 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
40 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 41 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
603 EXPECT_TRUE(browser_td >= renderer_td); | 604 EXPECT_TRUE(browser_td >= renderer_td); |
604 } | 605 } |
605 } | 606 } |
606 | 607 |
607 // Test IDC_CREATE_SHORTCUTS command is enabled for url scheme file, ftp, http | 608 // Test IDC_CREATE_SHORTCUTS command is enabled for url scheme file, ftp, http |
608 // and https and disabled for chrome://, about:// etc. | 609 // and https and disabled for chrome://, about:// etc. |
609 // TODO(pinkerton): Disable app-mode in the model until we implement it | 610 // TODO(pinkerton): Disable app-mode in the model until we implement it |
610 // on the Mac. http://crbug.com/13148 | 611 // on the Mac. http://crbug.com/13148 |
611 #if !defined(OS_MACOSX) | 612 #if !defined(OS_MACOSX) |
612 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFile) { | 613 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFile) { |
613 CommandUpdater* command_updater = browser()->command_updater(); | 614 CommandUpdater* command_updater = |
| 615 browser()->command_controller()->command_updater(); |
614 | 616 |
615 static const FilePath::CharType* kEmptyFile = FILE_PATH_LITERAL("empty.html"); | 617 static const FilePath::CharType* kEmptyFile = FILE_PATH_LITERAL("empty.html"); |
616 GURL file_url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | 618 GURL file_url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), |
617 FilePath(kEmptyFile))); | 619 FilePath(kEmptyFile))); |
618 ASSERT_TRUE(file_url.SchemeIs(chrome::kFileScheme)); | 620 ASSERT_TRUE(file_url.SchemeIs(chrome::kFileScheme)); |
619 ui_test_utils::NavigateToURL(browser(), file_url); | 621 ui_test_utils::NavigateToURL(browser(), file_url); |
620 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); | 622 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
621 } | 623 } |
622 | 624 |
623 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) { | 625 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) { |
624 CommandUpdater* command_updater = browser()->command_updater(); | 626 CommandUpdater* command_updater = |
| 627 browser()->command_controller()->command_updater(); |
625 | 628 |
626 ASSERT_TRUE(test_server()->Start()); | 629 ASSERT_TRUE(test_server()->Start()); |
627 GURL http_url(test_server()->GetURL("")); | 630 GURL http_url(test_server()->GetURL("")); |
628 ASSERT_TRUE(http_url.SchemeIs(chrome::kHttpScheme)); | 631 ASSERT_TRUE(http_url.SchemeIs(chrome::kHttpScheme)); |
629 ui_test_utils::NavigateToURL(browser(), http_url); | 632 ui_test_utils::NavigateToURL(browser(), http_url); |
630 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); | 633 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
631 } | 634 } |
632 | 635 |
633 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { | 636 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { |
634 CommandUpdater* command_updater = browser()->command_updater(); | 637 CommandUpdater* command_updater = |
| 638 browser()->command_controller()->command_updater(); |
635 | 639 |
636 net::TestServer test_server(net::TestServer::TYPE_HTTPS, | 640 net::TestServer test_server(net::TestServer::TYPE_HTTPS, |
637 net::TestServer::kLocalhost, | 641 net::TestServer::kLocalhost, |
638 FilePath(kDocRoot)); | 642 FilePath(kDocRoot)); |
639 ASSERT_TRUE(test_server.Start()); | 643 ASSERT_TRUE(test_server.Start()); |
640 GURL https_url(test_server.GetURL("/")); | 644 GURL https_url(test_server.GetURL("/")); |
641 ASSERT_TRUE(https_url.SchemeIs(chrome::kHttpsScheme)); | 645 ASSERT_TRUE(https_url.SchemeIs(chrome::kHttpsScheme)); |
642 ui_test_utils::NavigateToURL(browser(), https_url); | 646 ui_test_utils::NavigateToURL(browser(), https_url); |
643 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); | 647 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
644 } | 648 } |
645 | 649 |
646 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) { | 650 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) { |
647 CommandUpdater* command_updater = browser()->command_updater(); | 651 CommandUpdater* command_updater = |
| 652 browser()->command_controller()->command_updater(); |
648 | 653 |
649 net::TestServer test_server(net::TestServer::TYPE_FTP, | 654 net::TestServer test_server(net::TestServer::TYPE_FTP, |
650 net::TestServer::kLocalhost, | 655 net::TestServer::kLocalhost, |
651 FilePath(kDocRoot)); | 656 FilePath(kDocRoot)); |
652 ASSERT_TRUE(test_server.Start()); | 657 ASSERT_TRUE(test_server.Start()); |
653 GURL ftp_url(test_server.GetURL("")); | 658 GURL ftp_url(test_server.GetURL("")); |
654 ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme)); | 659 ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme)); |
655 ui_test_utils::NavigateToURL(browser(), ftp_url); | 660 ui_test_utils::NavigateToURL(browser(), ftp_url); |
656 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); | 661 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
657 } | 662 } |
658 | 663 |
659 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) { | 664 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) { |
660 CommandUpdater* command_updater = browser()->command_updater(); | 665 CommandUpdater* command_updater = |
| 666 browser()->command_controller()->command_updater(); |
661 | 667 |
662 // Urls that should not have shortcuts. | 668 // Urls that should not have shortcuts. |
663 GURL new_tab_url(chrome::kChromeUINewTabURL); | 669 GURL new_tab_url(chrome::kChromeUINewTabURL); |
664 ui_test_utils::NavigateToURL(browser(), new_tab_url); | 670 ui_test_utils::NavigateToURL(browser(), new_tab_url); |
665 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); | 671 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
666 | 672 |
667 GURL history_url(chrome::kChromeUIHistoryURL); | 673 GURL history_url(chrome::kChromeUIHistoryURL); |
668 ui_test_utils::NavigateToURL(browser(), history_url); | 674 ui_test_utils::NavigateToURL(browser(), history_url); |
669 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); | 675 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
670 | 676 |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1068 ui_test_utils::NavigateToURL(browser(), | 1074 ui_test_utils::NavigateToURL(browser(), |
1069 ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | 1075 ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), |
1070 FilePath(kTitle1File))); | 1076 FilePath(kTitle1File))); |
1071 | 1077 |
1072 ui_test_utils::WindowedNotificationObserver back_nav_load_observer( | 1078 ui_test_utils::WindowedNotificationObserver back_nav_load_observer( |
1073 content::NOTIFICATION_LOAD_STOP, | 1079 content::NOTIFICATION_LOAD_STOP, |
1074 content::Source<NavigationController>( | 1080 content::Source<NavigationController>( |
1075 &browser()->GetActiveWebContents()->GetController())); | 1081 &browser()->GetActiveWebContents()->GetController())); |
1076 chrome::GoBack(browser(), CURRENT_TAB); | 1082 chrome::GoBack(browser(), CURRENT_TAB); |
1077 back_nav_load_observer.Wait(); | 1083 back_nav_load_observer.Wait(); |
1078 EXPECT_TRUE(browser()->command_updater()->IsCommandEnabled(IDC_FORWARD)); | 1084 CommandUpdater* command_updater = |
| 1085 browser()->command_controller()->command_updater(); |
| 1086 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_FORWARD)); |
1079 | 1087 |
1080 ui_test_utils::WindowedNotificationObserver forward_nav_load_observer( | 1088 ui_test_utils::WindowedNotificationObserver forward_nav_load_observer( |
1081 content::NOTIFICATION_LOAD_STOP, | 1089 content::NOTIFICATION_LOAD_STOP, |
1082 content::Source<NavigationController>( | 1090 content::Source<NavigationController>( |
1083 &browser()->GetActiveWebContents()->GetController())); | 1091 &browser()->GetActiveWebContents()->GetController())); |
1084 chrome::GoForward(browser(), CURRENT_TAB); | 1092 chrome::GoForward(browser(), CURRENT_TAB); |
1085 // This check will happen before the navigation completes, since the browser | 1093 // This check will happen before the navigation completes, since the browser |
1086 // won't process the renderer's response until the Wait() call below. | 1094 // won't process the renderer's response until the Wait() call below. |
1087 EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_FORWARD)); | 1095 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_FORWARD)); |
1088 forward_nav_load_observer.Wait(); | 1096 forward_nav_load_observer.Wait(); |
1089 } | 1097 } |
1090 | 1098 |
1091 // Makes sure certain commands are disabled when Incognito mode is forced. | 1099 // Makes sure certain commands are disabled when Incognito mode is forced. |
1092 IN_PROC_BROWSER_TEST_F(BrowserTest, DisableMenuItemsWhenIncognitoIsForced) { | 1100 IN_PROC_BROWSER_TEST_F(BrowserTest, DisableMenuItemsWhenIncognitoIsForced) { |
1093 CommandUpdater* command_updater = browser()->command_updater(); | 1101 CommandUpdater* command_updater = |
| 1102 browser()->command_controller()->command_updater(); |
1094 // At the beginning, all commands are enabled. | 1103 // At the beginning, all commands are enabled. |
1095 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1104 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1096 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1105 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1097 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1106 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1098 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1107 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1099 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1108 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1100 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1109 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1101 | 1110 |
1102 // Set Incognito to FORCED. | 1111 // Set Incognito to FORCED. |
1103 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), | 1112 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), |
1104 IncognitoModePrefs::FORCED); | 1113 IncognitoModePrefs::FORCED); |
1105 // Bookmarks & Settings commands should get disabled. | 1114 // Bookmarks & Settings commands should get disabled. |
1106 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1115 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1107 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1116 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1108 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1117 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1109 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1118 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1110 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1119 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1111 // New Incognito Window command, however, should be enabled. | 1120 // New Incognito Window command, however, should be enabled. |
1112 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1121 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1113 | 1122 |
1114 // Create a new browser. | 1123 // Create a new browser. |
1115 Browser* new_browser = Browser::Create(browser()->profile()); | 1124 Browser* new_browser = Browser::Create(browser()->profile()); |
1116 CommandUpdater* new_command_updater = new_browser->command_updater(); | 1125 CommandUpdater* new_command_updater = |
| 1126 new_browser->command_controller()->command_updater(); |
1117 // It should have Bookmarks & Settings commands disabled by default. | 1127 // It should have Bookmarks & Settings commands disabled by default. |
1118 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1128 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1119 EXPECT_FALSE(new_command_updater->IsCommandEnabled( | 1129 EXPECT_FALSE(new_command_updater->IsCommandEnabled( |
1120 IDC_SHOW_BOOKMARK_MANAGER)); | 1130 IDC_SHOW_BOOKMARK_MANAGER)); |
1121 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1131 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1122 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1132 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1123 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1133 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1124 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1134 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1125 } | 1135 } |
1126 | 1136 |
1127 // Makes sure New Incognito Window command is disabled when Incognito mode is | 1137 // Makes sure New Incognito Window command is disabled when Incognito mode is |
1128 // not available. | 1138 // not available. |
1129 IN_PROC_BROWSER_TEST_F(BrowserTest, | 1139 IN_PROC_BROWSER_TEST_F(BrowserTest, |
1130 NoNewIncognitoWindowWhenIncognitoIsDisabled) { | 1140 NoNewIncognitoWindowWhenIncognitoIsDisabled) { |
1131 CommandUpdater* command_updater = browser()->command_updater(); | 1141 CommandUpdater* command_updater = |
| 1142 browser()->command_controller()->command_updater(); |
1132 // Set Incognito to DISABLED. | 1143 // Set Incognito to DISABLED. |
1133 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), | 1144 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), |
1134 IncognitoModePrefs::DISABLED); | 1145 IncognitoModePrefs::DISABLED); |
1135 // Make sure New Incognito Window command is disabled. All remaining commands | 1146 // Make sure New Incognito Window command is disabled. All remaining commands |
1136 // should be enabled. | 1147 // should be enabled. |
1137 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1148 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1138 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1149 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1139 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1150 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1140 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1151 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1141 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1152 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1142 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1153 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1143 | 1154 |
1144 // Create a new browser. | 1155 // Create a new browser. |
1145 Browser* new_browser = Browser::Create(browser()->profile()); | 1156 Browser* new_browser = Browser::Create(browser()->profile()); |
1146 CommandUpdater* new_command_updater = new_browser->command_updater(); | 1157 CommandUpdater* new_command_updater = |
| 1158 new_browser->command_controller()->command_updater(); |
1147 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1159 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1148 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1160 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1149 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1161 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1150 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1162 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1151 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1163 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1152 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1164 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1153 } | 1165 } |
1154 | 1166 |
1155 // Makes sure Extensions and Settings commands are disabled in certain | 1167 // Makes sure Extensions and Settings commands are disabled in certain |
1156 // circumstances even though normally they should stay enabled. | 1168 // circumstances even though normally they should stay enabled. |
1157 IN_PROC_BROWSER_TEST_F(BrowserTest, | 1169 IN_PROC_BROWSER_TEST_F(BrowserTest, |
1158 DisableExtensionsAndSettingsWhenIncognitoIsDisabled) { | 1170 DisableExtensionsAndSettingsWhenIncognitoIsDisabled) { |
1159 CommandUpdater* command_updater = browser()->command_updater(); | 1171 CommandUpdater* command_updater = |
| 1172 browser()->command_controller()->command_updater(); |
1160 // Disable extensions. This should disable Extensions menu. | 1173 // Disable extensions. This should disable Extensions menu. |
1161 browser()->profile()->GetExtensionService()->set_extensions_enabled(false); | 1174 browser()->profile()->GetExtensionService()->set_extensions_enabled(false); |
1162 // Set Incognito to DISABLED. | 1175 // Set Incognito to DISABLED. |
1163 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), | 1176 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), |
1164 IncognitoModePrefs::DISABLED); | 1177 IncognitoModePrefs::DISABLED); |
1165 // Make sure Manage Extensions command is disabled. | 1178 // Make sure Manage Extensions command is disabled. |
1166 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1179 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1167 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1180 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1168 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1181 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1169 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1182 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1170 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1183 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1171 | 1184 |
1172 // Create a popup (non-main-UI-type) browser. Settings command as well | 1185 // Create a popup (non-main-UI-type) browser. Settings command as well |
1173 // as Extensions should be disabled. | 1186 // as Extensions should be disabled. |
1174 Browser* popup_browser = browser()->CreateWithParams( | 1187 Browser* popup_browser = browser()->CreateWithParams( |
1175 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); | 1188 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); |
1176 CommandUpdater* popup_command_updater = popup_browser->command_updater(); | 1189 CommandUpdater* popup_command_updater = |
| 1190 popup_browser->command_controller()->command_updater(); |
1177 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1191 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1178 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1192 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1179 EXPECT_TRUE(popup_command_updater->IsCommandEnabled( | 1193 EXPECT_TRUE(popup_command_updater->IsCommandEnabled( |
1180 IDC_SHOW_BOOKMARK_MANAGER)); | 1194 IDC_SHOW_BOOKMARK_MANAGER)); |
1181 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1195 EXPECT_FALSE(popup_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1182 } | 1196 } |
1183 | 1197 |
1184 // Makes sure Extensions and Settings commands are disabled in certain | 1198 // Makes sure Extensions and Settings commands are disabled in certain |
1185 // circumstances even though normally they should stay enabled. | 1199 // circumstances even though normally they should stay enabled. |
1186 IN_PROC_BROWSER_TEST_F(BrowserTest, | 1200 IN_PROC_BROWSER_TEST_F(BrowserTest, |
1187 DisableOptionsAndImportMenuItemsConsistently) { | 1201 DisableOptionsAndImportMenuItemsConsistently) { |
1188 // Create a popup browser. | 1202 // Create a popup browser. |
1189 Browser* popup_browser = browser()->CreateWithParams( | 1203 Browser* popup_browser = browser()->CreateWithParams( |
1190 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); | 1204 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); |
1191 CommandUpdater* command_updater = popup_browser->command_updater(); | 1205 CommandUpdater* command_updater = |
| 1206 popup_browser->command_controller()->command_updater(); |
1192 // OPTIONS and IMPORT_SETTINGS are disabled for a non-normal UI. | 1207 // OPTIONS and IMPORT_SETTINGS are disabled for a non-normal UI. |
1193 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1208 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1194 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1209 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1195 | 1210 |
1196 // Set Incognito to FORCED. | 1211 // Set Incognito to FORCED. |
1197 IncognitoModePrefs::SetAvailability(popup_browser->profile()->GetPrefs(), | 1212 IncognitoModePrefs::SetAvailability(popup_browser->profile()->GetPrefs(), |
1198 IncognitoModePrefs::FORCED); | 1213 IncognitoModePrefs::FORCED); |
1199 // OPTIONS and IMPORT_SETTINGS are disabled when Incognito is forced. | 1214 // OPTIONS and IMPORT_SETTINGS are disabled when Incognito is forced. |
1200 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1215 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1201 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1216 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1240 | 1255 |
1241 chrome::Zoom(browser(), content::PAGE_ZOOM_RESET); | 1256 chrome::Zoom(browser(), content::PAGE_ZOOM_RESET); |
1242 } | 1257 } |
1243 | 1258 |
1244 IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCommandDisable) { | 1259 IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCommandDisable) { |
1245 ASSERT_TRUE(test_server()->Start()); | 1260 ASSERT_TRUE(test_server()->Start()); |
1246 host_resolver()->AddRule("www.example.com", "127.0.0.1"); | 1261 host_resolver()->AddRule("www.example.com", "127.0.0.1"); |
1247 GURL url(test_server()->GetURL("empty.html")); | 1262 GURL url(test_server()->GetURL("empty.html")); |
1248 ui_test_utils::NavigateToURL(browser(), url); | 1263 ui_test_utils::NavigateToURL(browser(), url); |
1249 | 1264 |
1250 CommandUpdater* command_updater = browser()->command_updater(); | 1265 CommandUpdater* command_updater = |
| 1266 browser()->command_controller()->command_updater(); |
1251 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_VIEW_SOURCE)); | 1267 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_VIEW_SOURCE)); |
1252 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_PRINT)); | 1268 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_PRINT)); |
1253 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SAVE_PAGE)); | 1269 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SAVE_PAGE)); |
1254 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_ENCODING_MENU)); | 1270 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_ENCODING_MENU)); |
1255 | 1271 |
1256 WebContents* contents = browser()->GetActiveWebContents(); | 1272 WebContents* contents = browser()->GetActiveWebContents(); |
1257 TestInterstitialPage* interstitial = new TestInterstitialPage( | 1273 TestInterstitialPage* interstitial = new TestInterstitialPage( |
1258 contents, false, GURL()); | 1274 contents, false, GURL()); |
1259 | 1275 |
1260 ui_test_utils::WindowedNotificationObserver interstitial_observer( | 1276 ui_test_utils::WindowedNotificationObserver interstitial_observer( |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1566 command_line->AppendSwitchASCII(switches::kApp, url.spec()); | 1582 command_line->AppendSwitchASCII(switches::kApp, url.spec()); |
1567 } | 1583 } |
1568 }; | 1584 }; |
1569 | 1585 |
1570 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { | 1586 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { |
1571 // Test that an application browser window loads correctly. | 1587 // Test that an application browser window loads correctly. |
1572 | 1588 |
1573 // Verify the browser is in application mode. | 1589 // Verify the browser is in application mode. |
1574 EXPECT_TRUE(browser()->IsApplication()); | 1590 EXPECT_TRUE(browser()->IsApplication()); |
1575 } | 1591 } |
OLD | NEW |