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

Unified Diff: ash/common/system/user/user_view.h

Issue 2678353005: Remove pre-MD code related to tray/menu user profiles. (Closed)
Patch Set: back out a11y changes and rebase Created 3 years, 10 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/common/system/user/user_card_view.cc ('k') | ash/common/system/user/user_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/user/user_view.h
diff --git a/ash/common/system/user/user_view.h b/ash/common/system/user/user_view.h
index 044364916883166be92b241e13190b0c0b7be7a7..ce79c63f6caa25a609eb0d93e32779bda7104b8c 100644
--- a/ash/common/system/user/user_view.h
+++ b/ash/common/system/user/user_view.h
@@ -14,12 +14,10 @@
#include "ui/views/controls/button/button.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/layout/box_layout.h"
-#include "ui/views/mouse_watcher.h"
#include "ui/views/view.h"
namespace gfx {
class Rect;
-class Size;
}
namespace views {
@@ -37,15 +35,11 @@ namespace tray {
// The view of a user item in system tray bubble.
class UserView : public views::View,
public views::ButtonListener,
- public views::MouseWatcherListener,
public views::FocusChangeListener {
public:
UserView(SystemTrayItem* owner, LoginStatus login, UserIndex index);
~UserView() override;
- // Overridden from MouseWatcherListener:
- void MouseMovedOutOfHost() override;
-
TrayUser::TestState GetStateForTest() const;
gfx::Rect GetBoundsInScreenOfUserButtonForTest();
@@ -56,9 +50,7 @@ class UserView : public views::View,
bool IsActiveUser() const;
// Overridden from views::View.
- gfx::Size GetPreferredSize() const override;
int GetHeightForWidth(int width) const override;
- void Layout() override;
// Overridden from views::ButtonListener.
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
@@ -69,7 +61,6 @@ class UserView : public views::View,
void AddLogoutButton(LoginStatus login);
void AddUserCard(LoginStatus login);
- void AddUserCardMd(LoginStatus login);
// Create the menu option to add another user. If |disabled| is set the user
// cannot actively click on the item.
@@ -95,9 +86,6 @@ class UserView : public views::View,
// False when the add user panel is visible but not activatable.
bool add_user_enabled_;
- // The mouse watcher which takes care of out of window hover events.
- std::unique_ptr<views::MouseWatcher> mouse_watcher_;
-
// The focus manager which we use to detect focus changes.
views::FocusManager* focus_manager_;
« no previous file with comments | « ash/common/system/user/user_card_view.cc ('k') | ash/common/system/user/user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698