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

Unified Diff: ash/common/system/user/user_card_view.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: Created 3 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: ash/common/system/user/user_card_view.cc
diff --git a/ash/common/system/user/user_card_view.cc b/ash/common/system/user/user_card_view.cc
index 27cd68d5eac9f64658d14954ce4f4dcc9f84b57e..dcc71b3c9f5aade64d06e9583121e0a0a2cd6994 100644
--- a/ash/common/system/user/user_card_view.cc
+++ b/ash/common/system/user/user_card_view.cc
@@ -306,7 +306,7 @@ UserCardView::UserCardView(LoginStatus login_status,
if (!is_active_user())
SetBorder(views::CreateEmptyBorder(0, kMenuExtraMarginFromLeftEdge, 0, 0));
- WmShell::Get()->media_controller()->AddObserver(this);
+ Shell::Get()->media_controller()->AddObserver(this);
if (login_status == LoginStatus::PUBLIC)
AddPublicModeUserContent(max_width);
@@ -315,7 +315,7 @@ UserCardView::UserCardView(LoginStatus login_status,
}
UserCardView::~UserCardView() {
- WmShell::Get()->media_controller()->RemoveObserver(this);
+ Shell::Get()->media_controller()->RemoveObserver(this);
}
void UserCardView::PaintChildren(const ui::PaintContext& context) {
@@ -464,7 +464,7 @@ void UserCardView::AddUserContent(views::BoxLayout* layout,
media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
AddChildView(media_capture_icon_);
- WmShell::Get()->media_controller()->RequestCaptureState();
+ Shell::Get()->media_controller()->RequestCaptureState();
}
}
« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698