Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/browser/ui/browser_command_controller_unittest.cc

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/browser_close_unittest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 TEST_F(BrowserCommandControllerTest, AvatarMenuAlwaysDisabledInIncognitoMode) { 224 TEST_F(BrowserCommandControllerTest, AvatarMenuAlwaysDisabledInIncognitoMode) {
225 if (!profiles::IsMultipleProfilesEnabled()) 225 if (!profiles::IsMultipleProfilesEnabled())
226 return; 226 return;
227 227
228 // Set up a profile with an off the record profile. 228 // Set up a profile with an off the record profile.
229 TestingProfile::Builder normal_builder; 229 TestingProfile::Builder normal_builder;
230 std::unique_ptr<TestingProfile> original_profile = normal_builder.Build(); 230 std::unique_ptr<TestingProfile> original_profile = normal_builder.Build();
231 231
232 // Create a new browser based on the off the record profile. 232 // Create a new browser based on the off the record profile.
233 Browser::CreateParams profile_params( 233 Browser::CreateParams profile_params(
234 original_profile->GetOffTheRecordProfile()); 234 original_profile->GetOffTheRecordProfile(), true);
235 std::unique_ptr<Browser> otr_browser( 235 std::unique_ptr<Browser> otr_browser(
236 chrome::CreateBrowserWithTestWindowForParams(&profile_params)); 236 chrome::CreateBrowserWithTestWindowForParams(&profile_params));
237 237
238 chrome::BrowserCommandController command_controller(otr_browser.get()); 238 chrome::BrowserCommandController command_controller(otr_browser.get());
239 const CommandUpdater* command_updater = command_controller.command_updater(); 239 const CommandUpdater* command_updater = command_controller.command_updater();
240 240
241 // The avatar menu should be disabled. 241 // The avatar menu should be disabled.
242 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU)); 242 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
243 // The command line is reset at the end of every test by the test suite. 243 // The command line is reset at the end of every test by the test suite.
244 } 244 }
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 } 449 }
450 450
451 TEST_F(BrowserCommandControllerTest, IncognitoModeOnSigninAllowedPrefChange) { 451 TEST_F(BrowserCommandControllerTest, IncognitoModeOnSigninAllowedPrefChange) {
452 // Set up a profile with an off the record profile. 452 // Set up a profile with an off the record profile.
453 std::unique_ptr<TestingProfile> profile1 = TestingProfile::Builder().Build(); 453 std::unique_ptr<TestingProfile> profile1 = TestingProfile::Builder().Build();
454 Profile* profile2 = profile1->GetOffTheRecordProfile(); 454 Profile* profile2 = profile1->GetOffTheRecordProfile();
455 455
456 EXPECT_EQ(profile2->GetOriginalProfile(), profile1.get()); 456 EXPECT_EQ(profile2->GetOriginalProfile(), profile1.get());
457 457
458 // Create a new browser based on the off the record profile. 458 // Create a new browser based on the off the record profile.
459 Browser::CreateParams profile_params(profile1->GetOffTheRecordProfile()); 459 Browser::CreateParams profile_params(profile1->GetOffTheRecordProfile(),
460 true);
460 std::unique_ptr<Browser> browser2( 461 std::unique_ptr<Browser> browser2(
461 chrome::CreateBrowserWithTestWindowForParams(&profile_params)); 462 chrome::CreateBrowserWithTestWindowForParams(&profile_params));
462 463
463 chrome::BrowserCommandController command_controller(browser2.get()); 464 chrome::BrowserCommandController command_controller(browser2.get());
464 const CommandUpdater* command_updater = command_controller.command_updater(); 465 const CommandUpdater* command_updater = command_controller.command_updater();
465 466
466 // Check that the SYNC_SETUP command is updated on preference change. 467 // Check that the SYNC_SETUP command is updated on preference change.
467 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); 468 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
468 profile1->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false); 469 profile1->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
469 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); 470 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
470 } 471 }
471 472
472 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) { 473 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) {
473 chrome::BrowserCommandController command_controller(browser()); 474 chrome::BrowserCommandController command_controller(browser());
474 const CommandUpdater* command_updater = command_controller.command_updater(); 475 const CommandUpdater* command_updater = command_controller.command_updater();
475 476
476 // Check that the SYNC_SETUP command is updated on preference change. 477 // Check that the SYNC_SETUP command is updated on preference change.
477 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); 478 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
478 profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false); 479 profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
479 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP)); 480 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
480 } 481 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_close_unittest.cc ('k') | chrome/browser/ui/browser_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698