| 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 "chrome/browser/ui/browser_command_controller.h" | 5 #include "chrome/browser/ui/browser_command_controller.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU)); | 352 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU)); |
| 353 #if defined(GOOGLE_CHROME_BUILD) | 353 #if defined(GOOGLE_CHROME_BUILD) |
| 354 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK)); | 354 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK)); |
| 355 #endif | 355 #endif |
| 356 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); | 356 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); |
| 357 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); | 357 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); |
| 358 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES)); | 358 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES)); |
| 359 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS)); | 359 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS)); |
| 360 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ABOUT)); | 360 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ABOUT)); |
| 361 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU)); | 361 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU)); |
| 362 |
| 363 // In fullscreen, only the exit fullscreen commands are reserved. All other |
| 364 // shortcuts are unreserved. See https://goo.gl/4tJ32G. |
| 365 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_CLOSE_TAB)); |
| 366 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_CLOSE_WINDOW)); |
| 367 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_NEW_INCOGNITO_WINDOW)); |
| 368 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_NEW_TAB)); |
| 369 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_NEW_WINDOW)); |
| 370 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SELECT_NEXT_TAB)); |
| 371 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SELECT_PREVIOUS_TAB)); |
| 372 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EXIT)); |
| 362 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); | 373 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); |
| 363 | 374 |
| 364 // Exit fullscreen. | 375 // Exit fullscreen. |
| 365 chrome::ToggleFullscreenMode(browser()); | 376 chrome::ToggleFullscreenMode(browser()); |
| 366 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 377 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 367 browser()->command_controller()->FullscreenStateChanged(); | 378 browser()->command_controller()->FullscreenStateChanged(); |
| 368 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL)); | 379 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL)); |
| 369 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB)); | 380 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB)); |
| 370 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR)); | 381 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR)); |
| 371 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION)); | 382 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION)); |
| 372 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_SEARCH)); | 383 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_SEARCH)); |
| 373 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_MENU_BAR)); | 384 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_MENU_BAR)); |
| 374 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_NEXT_PANE)); | 385 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_NEXT_PANE)); |
| 375 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_PREVIOUS_PANE)); | 386 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_PREVIOUS_PANE)); |
| 376 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_BOOKMARKS)); | 387 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_BOOKMARKS)); |
| 377 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU)); | 388 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU)); |
| 378 #if defined(GOOGLE_CHROME_BUILD) | 389 #if defined(GOOGLE_CHROME_BUILD) |
| 379 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK)); | 390 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK)); |
| 380 #endif | 391 #endif |
| 381 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); | 392 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); |
| 382 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); | 393 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); |
| 383 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES)); | 394 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES)); |
| 384 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS)); | 395 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS)); |
| 385 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ABOUT)); | 396 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ABOUT)); |
| 386 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU)); | 397 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU)); |
| 398 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_CLOSE_TAB)); |
| 399 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_CLOSE_WINDOW)); |
| 400 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_NEW_INCOGNITO_WINDOW)); |
| 401 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_NEW_TAB)); |
| 402 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_NEW_WINDOW)); |
| 403 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SELECT_NEXT_TAB)); |
| 404 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SELECT_PREVIOUS_TAB)); |
| 405 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EXIT)); |
| 387 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); | 406 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN)); |
| 388 | 407 |
| 389 // Guest Profiles disallow some options. | 408 // Guest Profiles disallow some options. |
| 390 TestingProfile* testprofile = browser()->profile()->AsTestingProfile(); | 409 TestingProfile* testprofile = browser()->profile()->AsTestingProfile(); |
| 391 EXPECT_TRUE(testprofile); | 410 EXPECT_TRUE(testprofile); |
| 392 testprofile->SetGuestSession(true); | 411 testprofile->SetGuestSession(true); |
| 393 | 412 |
| 394 browser()->command_controller()->FullscreenStateChanged(); | 413 browser()->command_controller()->FullscreenStateChanged(); |
| 395 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); | 414 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS)); |
| 396 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); | 415 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS)); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 419 | 438 |
| 420 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) { | 439 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) { |
| 421 chrome::BrowserCommandController command_controller(browser()); | 440 chrome::BrowserCommandController command_controller(browser()); |
| 422 const CommandUpdater* command_updater = command_controller.command_updater(); | 441 const CommandUpdater* command_updater = command_controller.command_updater(); |
| 423 | 442 |
| 424 // Check that the SYNC_SETUP command is updated on preference change. | 443 // Check that the SYNC_SETUP command is updated on preference change. |
| 425 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); | 444 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); |
| 426 profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false); | 445 profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false); |
| 427 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); | 446 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); |
| 428 } | 447 } |
| OLD | NEW |