#include "base/win/windows_version.h"
#endif
-using ash::internal::ShelfView;
-using ash::internal::ShelfButton;
+using ash::ShelfView;
+using ash::ShelfButton;
namespace ash {
shelf_model_(NULL),
item_delegate_manager_(NULL) {}
- virtual ~ShelfTest() {}
+ ~ShelfTest() override {}
- virtual void SetUp() {
+ void SetUp() override {
test::AshTestBase::SetUp();
shelf_ = Shelf::ForPrimaryDisplay();
test_.reset(new ash::test::ShelfViewTestAPI(shelf_view_));
}
- virtual void TearDown() OVERRIDE {
- test::AshTestBase::TearDown();
- }
+ void TearDown() override { test::AshTestBase::TearDown(); }
Shelf* shelf() {
return shelf_;