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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 12550006: Mac: Add a shortcut to open the Apps page from the bookmark bar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed failing unit tests. Created 7 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/bookmarks/bookmark_bar_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index bb94ee41618a97cb4943f5e0c1f6162b0765c5f0..2782308e6b7dfb1455dbf893c4712282760e3c64 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -25,6 +25,7 @@
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
#import "chrome/browser/ui/cocoa/view_resizer_pong.h"
+#include "chrome/common/pref_names.h"
#include "chrome/test/base/model_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
@@ -1517,6 +1518,9 @@ TEST_F(BookmarkBarControllerTest, ShrinkOrHideView) {
}
TEST_F(BookmarkBarControllerTest, LastBookmarkResizeBehavior) {
+ // This test assumes the Apps button is not displayed.
+ profile()->GetPrefs()->SetBoolean(
+ prefs::kShowAppsShortcutInBookmarkBar, false);
Alexei Svitkine (slow) 2013/03/11 21:06:43 Please clean up after the test - don't just set a
beaudoin 2013/03/11 21:29:56 Looks like this was not needed after all. Done.
BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");

Powered by Google App Engine
This is Rietveld 408576698