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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 2 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
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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 }; 333 };
334 334
335 class BookmarkBarControllerTest : public BookmarkBarControllerTestBase { 335 class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
336 public: 336 public:
337 base::scoped_nsobject<NSButtonCell> cell_; 337 base::scoped_nsobject<NSButtonCell> cell_;
338 base::scoped_nsobject<BookmarkBarControllerNoOpen> bar_; 338 base::scoped_nsobject<BookmarkBarControllerNoOpen> bar_;
339 339
340 virtual void SetUp() { 340 virtual void SetUp() {
341 BookmarkBarControllerTestBase::SetUp(); 341 BookmarkBarControllerTestBase::SetUp();
342 ASSERT_TRUE(browser()); 342 ASSERT_TRUE(browser());
343 AddCommandLineSwitches();
344 343
345 bar_.reset( 344 bar_.reset(
346 [[BookmarkBarControllerNoOpen alloc] 345 [[BookmarkBarControllerNoOpen alloc]
347 initWithBrowser:browser() 346 initWithBrowser:browser()
348 initialWidth:NSWidth([parent_view_ frame]) 347 initialWidth:NSWidth([parent_view_ frame])
349 delegate:nil 348 delegate:nil
350 resizeDelegate:resizeDelegate_.get()]); 349 resizeDelegate:resizeDelegate_.get()]);
351 350
352 InstallAndToggleBar(bar_.get()); 351 InstallAndToggleBar(bar_.get());
353 } 352 }
354 353
355 virtual void AddCommandLineSwitches() {}
356
357 BookmarkBarControllerNoOpen* noOpenBar() { 354 BookmarkBarControllerNoOpen* noOpenBar() {
358 return (BookmarkBarControllerNoOpen*)bar_.get(); 355 return (BookmarkBarControllerNoOpen*)bar_.get();
359 } 356 }
360 }; 357 };
361 358
362 TEST_F(BookmarkBarControllerTest, ShowWhenShowBookmarkBarTrue) { 359 TEST_F(BookmarkBarControllerTest, ShowWhenShowBookmarkBarTrue) {
363 [bar_ updateState:BookmarkBar::SHOW 360 [bar_ updateState:BookmarkBar::SHOW
364 changeType:BookmarkBar::DONT_ANIMATE_STATE_CHANGE]; 361 changeType:BookmarkBar::DONT_ANIMATE_STATE_CHANGE];
365 EXPECT_TRUE([bar_ isInState:BookmarkBar::SHOW]); 362 EXPECT_TRUE([bar_ isInState:BookmarkBar::SHOW]);
366 EXPECT_FALSE([bar_ isInState:BookmarkBar::DETACHED]); 363 EXPECT_FALSE([bar_ isInState:BookmarkBar::DETACHED]);
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 [[bar_ view] setFrame:frame]; 1540 [[bar_ view] setFrame:frame];
1544 EXPECT_EQ(offTheSideButtonIsHiddenResults[i], 1541 EXPECT_EQ(offTheSideButtonIsHiddenResults[i],
1545 [bar_ offTheSideButtonIsHidden]); 1542 [bar_ offTheSideButtonIsHidden]);
1546 EXPECT_EQ(displayedButtonCountResults[i], [bar_ displayedButtonCount]); 1543 EXPECT_EQ(displayedButtonCountResults[i], [bar_ displayedButtonCount]);
1547 } 1544 }
1548 } 1545 }
1549 1546
1550 class BookmarkBarControllerWithInstantExtendedTest : 1547 class BookmarkBarControllerWithInstantExtendedTest :
1551 public BookmarkBarControllerTest { 1548 public BookmarkBarControllerTest {
1552 public: 1549 public:
1553 virtual void AddCommandLineSwitches() OVERRIDE {
1554 CommandLine::ForCurrentProcess()->AppendSwitch(
1555 switches::kEnableInstantExtendedAPI);
1556 }
1557 }; 1550 };
1558 1551
1559 TEST_F(BookmarkBarControllerWithInstantExtendedTest, 1552 TEST_F(BookmarkBarControllerWithInstantExtendedTest,
1560 BookmarksWithAppsPageShortcut) { 1553 BookmarksWithAppsPageShortcut) {
1561 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); 1554 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
1562 const BookmarkNode* root = model->bookmark_bar_node(); 1555 const BookmarkNode* root = model->bookmark_bar_node();
1563 const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b "); 1556 const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
1564 test::AddNodesFromModelString(model, root, model_string); 1557 test::AddNodesFromModelString(model, root, model_string);
1565 [bar_ frameDidChange]; 1558 [bar_ frameDidChange];
1566 1559
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
2069 "2f3b ] 4b "); 2062 "2f3b ] 4b ");
2070 actual = test::ModelStringFromNode(root); 2063 actual = test::ModelStringFromNode(root);
2071 EXPECT_EQ(expected, actual); 2064 EXPECT_EQ(expected, actual);
2072 2065
2073 // Verify that the other bookmark folder can't be deleted. 2066 // Verify that the other bookmark folder can't be deleted.
2074 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2067 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2075 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2068 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2076 } 2069 }
2077 2070
2078 } // namespace 2071 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698