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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index 6a9cb3fd820a8817d0d884d347b860080a700bff..a3bd378761915fc3d7a9e7363c57a8ad017b9747 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -266,7 +266,7 @@ class TestItem : public SystemTrayItem {
detailed_view_(nullptr),
notification_view_(nullptr) {}
- views::View* CreateTrayView(user::LoginStatus status) override {
+ views::View* CreateTrayView(LoginStatus status) override {
tray_view_ = new views::View;
// Add a label so it has non-zero width.
tray_view_->SetLayoutManager(new views::FillLayout);
@@ -274,14 +274,14 @@ class TestItem : public SystemTrayItem {
return tray_view_;
}
- views::View* CreateDefaultView(user::LoginStatus status) override {
+ views::View* CreateDefaultView(LoginStatus status) override {
default_view_ = new views::View;
default_view_->SetLayoutManager(new views::FillLayout);
default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default")));
return default_view_;
}
- views::View* CreateDetailedView(user::LoginStatus status) override {
+ views::View* CreateDetailedView(LoginStatus status) override {
detailed_view_ = new views::View;
detailed_view_->SetLayoutManager(new views::FillLayout);
detailed_view_->AddChildView(
@@ -289,7 +289,7 @@ class TestItem : public SystemTrayItem {
return detailed_view_;
}
- views::View* CreateNotificationView(user::LoginStatus status) override {
+ views::View* CreateNotificationView(LoginStatus status) override {
notification_view_ = new views::View;
return notification_view_;
}
@@ -302,7 +302,7 @@ class TestItem : public SystemTrayItem {
void DestroyNotificationView() override { notification_view_ = nullptr; }
- void UpdateAfterLoginStatusChange(user::LoginStatus status) override {}
+ void UpdateAfterLoginStatusChange(LoginStatus status) override {}
views::View* tray_view() const { return tray_view_; }
views::View* default_view() const { return default_view_; }
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698