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

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

Issue 2743633005: [Mac] Add Home button to Default Touch Bar (Closed)
Patch Set: Add comments Created 3 years, 9 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
Index: chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm b/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm
index 92ac48ee8005a1af6a5daba32ef484f3d10bcb63..fa9cdff2391c1fd55117803265d8916ceeaaa98a 100644
--- a/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm
@@ -9,6 +9,8 @@
#include "chrome/app/chrome_command_ids.h"
#import "chrome/browser/ui/cocoa/browser_window_touch_bar.h"
#include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
+#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_service.h"
#include "testing/gtest/include/gtest/gtest.h"
class BrowserWindowTouchBarUnitTest : public CocoaProfileTest {
@@ -16,8 +18,9 @@ class BrowserWindowTouchBarUnitTest : public CocoaProfileTest {
void SetUp() override {
CocoaProfileTest::SetUp();
ASSERT_TRUE(browser());
- browserWindowTouchBar_.reset(
- [[BrowserWindowTouchBar alloc] initWithBrowser:browser()]);
+ browserWindowTouchBar_.reset([[BrowserWindowTouchBar alloc]
+ initWithBrowser:browser()
+ browserWindowController:nil]);
}
void TearDown() override { CocoaProfileTest::TearDown(); }
@@ -29,10 +32,24 @@ TEST_F(BrowserWindowTouchBarUnitTest, TouchBarItems) {
if (!base::mac::IsAtLeastOS10_12())
return;
- NSTouchBar* touchBar = [browserWindowTouchBar_ makeTouchBar];
- NSArray* touchBarItemIds = [touchBar itemIdentifiers];
+ PrefService* prefs = profile()->GetPrefs();
+ DCHECK(prefs);
+ prefs->SetBoolean(prefs::kShowHomeButton, true);
+
+ NSArray* touchBarItemIds =
+ [[browserWindowTouchBar_ makeTouchBar] itemIdentifiers];
+ EXPECT_TRUE([touchBarItemIds containsObject:@"BackForwardTouchId"]);
+ EXPECT_TRUE([touchBarItemIds containsObject:@"ReloadOrStopTouchId"]);
+ EXPECT_TRUE([touchBarItemIds containsObject:@"HomeTouchId"]);
+ EXPECT_TRUE([touchBarItemIds containsObject:@"SearchTouchId"]);
+ EXPECT_TRUE([touchBarItemIds containsObject:@"NewTabTouchId"]);
+ EXPECT_TRUE([touchBarItemIds containsObject:@"StarTouchId"]);
+
+ prefs->SetBoolean(prefs::kShowHomeButton, false);
+ touchBarItemIds = [[browserWindowTouchBar_ makeTouchBar] itemIdentifiers];
EXPECT_TRUE([touchBarItemIds containsObject:@"BackForwardTouchId"]);
EXPECT_TRUE([touchBarItemIds containsObject:@"ReloadOrStopTouchId"]);
+ EXPECT_FALSE([touchBarItemIds containsObject:@"HomeTouchId"]);
EXPECT_TRUE([touchBarItemIds containsObject:@"SearchTouchId"]);
EXPECT_TRUE([touchBarItemIds containsObject:@"NewTabTouchId"]);
EXPECT_TRUE([touchBarItemIds containsObject:@"StarTouchId"]);

Powered by Google App Engine
This is Rietveld 408576698