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

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

Issue 15670011: Prevent new Browser windows from violating the IncognitoModeAvailability policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | 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 <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 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); 1346 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_NEW_WINDOW));
1347 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER)); 1347 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER));
1348 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); 1348 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS));
1349 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); 1349 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS));
1350 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS)); 1350 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS));
1351 // New Incognito Window command, however, should be enabled. 1351 // New Incognito Window command, however, should be enabled.
1352 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); 1352 EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW));
1353 1353
1354 // Create a new browser. 1354 // Create a new browser.
1355 Browser* new_browser = 1355 Browser* new_browser =
1356 new Browser(Browser::CreateParams(browser()->profile(), 1356 new Browser(Browser::CreateParams(
1357 browser()->host_desktop_type())); 1357 browser()->profile()->GetOffTheRecordProfile(),
1358 browser()->host_desktop_type()));
1358 CommandUpdater* new_command_updater = 1359 CommandUpdater* new_command_updater =
1359 new_browser->command_controller()->command_updater(); 1360 new_browser->command_controller()->command_updater();
1360 // It should have Bookmarks & Settings commands disabled by default. 1361 // It should have Bookmarks & Settings commands disabled by default.
1361 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW)); 1362 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_NEW_WINDOW));
1362 EXPECT_FALSE(new_command_updater->IsCommandEnabled( 1363 EXPECT_FALSE(new_command_updater->IsCommandEnabled(
1363 IDC_SHOW_BOOKMARK_MANAGER)); 1364 IDC_SHOW_BOOKMARK_MANAGER));
1364 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS)); 1365 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS));
1365 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS)); 1366 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_MANAGE_EXTENSIONS));
1366 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS)); 1367 EXPECT_FALSE(new_command_updater->IsCommandEnabled(IDC_OPTIONS));
1367 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW)); 1368 EXPECT_TRUE(new_command_updater->IsCommandEnabled(IDC_NEW_INCOGNITO_WINDOW));
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 2197 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
2197 } 2198 }
2198 2199
2199 // Shift-middle-clicks open in a foreground tab. 2200 // Shift-middle-clicks open in a foreground tab.
2200 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { 2201 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
2201 int modifiers = WebKit::WebInputEvent::ShiftKey; 2202 int modifiers = WebKit::WebInputEvent::ShiftKey;
2202 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; 2203 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
2203 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; 2204 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
2204 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 2205 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
2205 } 2206 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698