| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ios/chrome/browser/ui/ntp/new_tab_page_controller.h" | 5 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "testing/gtest_mac.h" | 27 #include "testing/gtest_mac.h" |
| 28 #import "third_party/ocmock/OCMock/OCMock.h" | 28 #import "third_party/ocmock/OCMock/OCMock.h" |
| 29 #import "third_party/ocmock/gtest_support.h" | 29 #import "third_party/ocmock/gtest_support.h" |
| 30 | 30 |
| 31 #if !defined(__has_feature) || !__has_feature(objc_arc) | 31 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 32 #error "This file requires ARC support." | 32 #error "This file requires ARC support." |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 @interface NewTabPageController (TestSupport) | 35 @interface NewTabPageController (TestSupport) |
| 36 - (id<NewTabPagePanelProtocol>)currentController; | 36 - (id<NewTabPagePanelProtocol>)currentController; |
| 37 - (id<NewTabPagePanelProtocol>)bookmarkController; | 37 - (BookmarkHomeTabletNTPController*)bookmarkController; |
| 38 - (id<NewTabPagePanelProtocol>)incognitoController; | 38 - (id<NewTabPagePanelProtocol>)incognitoController; |
| 39 @end | 39 @end |
| 40 | 40 |
| 41 @interface NewTabPageController (PrivateMethods) | 41 @interface NewTabPageController (PrivateMethods) |
| 42 @property(nonatomic, retain) NewTabPageView* ntpView; | 42 @property(nonatomic, retain) NewTabPageView* ntpView; |
| 43 @end | 43 @end |
| 44 | 44 |
| 45 @implementation NewTabPageController (TestSupport) | 45 @implementation NewTabPageController (TestSupport) |
| 46 | 46 |
| 47 - (id<NewTabPagePanelProtocol>)currentController { | 47 - (id<NewTabPagePanelProtocol>)currentController { |
| 48 return currentController_; | 48 return currentController_; |
| 49 } | 49 } |
| 50 | 50 |
| 51 - (id<NewTabPagePanelProtocol>)bookmarkController { | 51 - (BookmarkHomeTabletNTPController*)bookmarkController { |
| 52 return bookmarkController_.get(); | 52 return bookmarkController_.get(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 - (id<NewTabPagePanelProtocol>)incognitoController { | 55 - (id<NewTabPagePanelProtocol>)incognitoController { |
| 56 return incognitoController_; | 56 return incognitoController_; |
| 57 } | 57 } |
| 58 | 58 |
| 59 @end | 59 @end |
| 60 | 60 |
| 61 namespace { | 61 namespace { |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 EXPECT_EQ("open_tabs", | 208 EXPECT_EQ("open_tabs", |
| 209 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); | 209 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); |
| 210 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); | 210 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); |
| 211 EXPECT_EQ(NewTabPage::kBookmarksPanel, | 211 EXPECT_EQ(NewTabPage::kBookmarksPanel, |
| 212 NewTabPage::IdentifierFromFragment("bookmarks")); | 212 NewTabPage::IdentifierFromFragment("bookmarks")); |
| 213 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); | 213 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); |
| 214 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); | 214 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); |
| 215 } | 215 } |
| 216 | 216 |
| 217 } // anonymous namespace | 217 } // anonymous namespace |
| OLD | NEW |