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/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1308 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1308 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1309 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); | 1309 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); |
1310 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1310 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1311 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1311 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1312 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1312 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1313 // New Incognito Window command, however, should be enabled. | 1313 // New Incognito Window command, however, should be enabled. |
1314 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1314 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
1315 | 1315 |
1316 // Create a new browser. | 1316 // Create a new browser. |
1317 Browser* new_browser = | 1317 Browser* new_browser = |
1318 new Browser(Browser::CreateParams(browser()->profile(), | 1318 new Browser(Browser::CreateParams( |
1319 browser()->host_desktop_type())); | 1319 browser()->profile()->GetOffTheRecordProfile(), |
| 1320 browser()->host_desktop_type())); |
1320 CommandUpdater* new_command_updater = | 1321 CommandUpdater* new_command_updater = |
1321 new_browser->command_controller()->command_updater(); | 1322 new_browser->command_controller()->command_updater(); |
1322 // It should have Bookmarks & Settings commands disabled by default. | 1323 // It should have Bookmarks & Settings commands disabled by default. |
1323 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); | 1324 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); |
1324 EXPECT_FALSE(new_command_updater->IsCommandEnabled( | 1325 EXPECT_FALSE(new_command_updater->IsCommandEnabled( |
1325 IDC_SHOW_BOOKMARK_MANAGER)); | 1326 IDC_SHOW_BOOKMARK_MANAGER)); |
1326 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); | 1327 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); |
1327 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); | 1328 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); |
1328 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); | 1329 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); |
1329 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); | 1330 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2158 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 2159 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
2159 } | 2160 } |
2160 | 2161 |
2161 // Shift-middle-clicks open in a foreground tab. | 2162 // Shift-middle-clicks open in a foreground tab. |
2162 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { | 2163 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { |
2163 int modifiers = WebKit::WebInputEvent::ShiftKey; | 2164 int modifiers = WebKit::WebInputEvent::ShiftKey; |
2164 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; | 2165 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; |
2165 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; | 2166 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; |
2166 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); | 2167 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); |
2167 } | 2168 } |
OLD | NEW |