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

Unified Diff: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm

Issue 2001103003: Remove Mac Cocoa fullscreen prompt. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fullscreen-mac-always-use-views
Patch Set: Fix compile. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm
deleted file mode 100644
index ed6e6361297ae540a481c4afa8c8e103e36c770c..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h"
-
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h"
-#include "chrome/browser/ui/cocoa/browser_window_controller.h"
-#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/grit/generated_resources.h"
-#include "chrome/test/base/testing_profile.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/site_instance.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/test/test_utils.h"
-#include "testing/gtest_mac.h"
-#include "ui/base/accelerators/platform_accelerator_cocoa.h"
-#import "ui/base/cocoa/controls/hyperlink_text_view.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-
-using content::SiteInstance;
-using content::WebContents;
-
-@interface ExclusiveAccessBubbleWindowController (JustForTesting)
-// Already defined.
-+ (NSString*)keyCombinationForAccelerator:
- (const ui::PlatformAcceleratorCocoa&)item;
-- (void)initializeLabelAndButton;
-@end
-
-@interface ExclusiveAccessBubbleWindowController (ExposedForTesting)
-- (NSTextField*)exitLabelPlaceholder;
-- (NSTextView*)exitLabel;
-- (NSString*)denyButtonText;
-@end
-
-@implementation ExclusiveAccessBubbleWindowController (ExposedForTesting)
-- (NSTextField*)exitLabelPlaceholder {
- return exitLabelPlaceholder_;
-}
-
-- (HyperlinkTextView*)exitLabel {
- return exitLabel_;
-}
-
-- (NSString*)denyButtonText {
- return [denyButton_ title];
-}
-@end
-
-class ExclusiveAccessBubbleWindowControllerTest : public CocoaProfileTest {
- public:
- void SetUp() override {
- CocoaProfileTest::SetUp();
- ASSERT_TRUE(profile());
-
- site_instance_ = SiteInstance::Create(profile());
- controller_.reset([[ExclusiveAccessBubbleWindowController alloc]
- initWithOwner:nil
- exclusive_access_manager:browser()->exclusive_access_manager()
- profile:browser()->profile()
- url:GURL()
- bubbleType:
- EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION]);
- EXPECT_TRUE([controller_ window]);
- }
-
- void TearDown() override {
- [controller_ close];
- controller_.reset();
- CocoaProfileTest::TearDown();
- }
-
- void AppendTabToStrip() {
- WebContents* web_contents = WebContents::Create(
- content::WebContents::CreateParams(profile(), site_instance_.get()));
- browser()->tab_strip_model()->AppendWebContents(web_contents,
- /*foreground=*/true);
- }
-
- scoped_refptr<SiteInstance> site_instance_;
- base::scoped_nsobject<ExclusiveAccessBubbleWindowController> controller_;
-};
-
-TEST_F(ExclusiveAccessBubbleWindowControllerTest, LabelWasReplaced) {
- EXPECT_FALSE([controller_ exitLabelPlaceholder]);
- EXPECT_TRUE([controller_ exitLabel]);
-}
-
-TEST_F(ExclusiveAccessBubbleWindowControllerTest, ShortcutText) {
- ui::PlatformAcceleratorCocoa cmd_F(@"F", NSCommandKeyMask);
- ui::PlatformAcceleratorCocoa cmd_shift_f(@"f",
- NSCommandKeyMask | NSShiftKeyMask);
- NSString* cmd_F_text = [ExclusiveAccessBubbleWindowController
- keyCombinationForAccelerator:cmd_F];
- NSString* cmd_shift_f_text = [ExclusiveAccessBubbleWindowController
- keyCombinationForAccelerator:cmd_shift_f];
- EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text);
- EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text);
-}
-
-// http://crbug.com/139944
-TEST_F(ExclusiveAccessBubbleWindowControllerTest, DenyButtonText) {
- controller_.reset([[ExclusiveAccessBubbleWindowController alloc]
- initWithOwner:nil
- exclusive_access_manager:browser()->exclusive_access_manager()
- profile:browser()->profile()
- url:GURL()
- bubbleType:EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS]);
- [controller_ initializeLabelAndButton];
- NSString* mouselock_deny_button_text = [controller_ denyButtonText];
- EXPECT_NSEQ(l10n_util::GetNSString(IDS_FULLSCREEN_DENY),
- mouselock_deny_button_text);
-
- controller_.reset([[ExclusiveAccessBubbleWindowController alloc]
- initWithOwner:nil
- exclusive_access_manager:browser()->exclusive_access_manager()
- profile:browser()->profile()
- url:GURL()
- bubbleType:
- EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS]);
- [controller_ initializeLabelAndButton];
- NSString* fullscreen_mouselock_deny_button_text =
- [controller_ denyButtonText];
- EXPECT_NSEQ(l10n_util::GetNSString(IDS_FULLSCREEN_EXIT),
- fullscreen_mouselock_deny_button_text);
-}
« no previous file with comments | « chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698