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

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.h

Issue 2708073002: Removing pre-material design menu setting. (Closed)
Patch Set: Replacing functions by variables 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
Index: chrome/browser/ui/views/profiles/profile_chooser_view.h
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.h b/chrome/browser/ui/views/profiles/profile_chooser_view.h
index 3d41e57af49bba6f2019ab445b6c826d7cb4087a..a7bc99e97d0c0d32a4e8e85b5a57f17b028ec9cf 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.h
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h
@@ -23,10 +23,6 @@
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/link_listener.h"
#include "ui/views/controls/styled_label_listener.h"
-#include "ui/views/controls/textfield/textfield_controller.h"
-
-class EditableProfilePhoto;
-class EditableProfileName;
namespace views {
class GridLayout;
@@ -44,7 +40,6 @@ class ProfileChooserView : public content::WebContentsDelegate,
public views::ButtonListener,
public views::LinkListener,
public views::StyledLabelListener,
- public views::TextfieldController,
public AvatarMenuObserver,
public OAuth2TokenService::Observer {
public:
@@ -103,10 +98,6 @@ class ProfileChooserView : public content::WebContentsDelegate,
const gfx::Range& range,
int event_flags) override;
- // views::TextfieldController:
- bool HandleKeyEvent(views::Textfield* sender,
- const ui::KeyEvent& key_event) override;
-
// AvatarMenuObserver:
void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override;
@@ -147,9 +138,6 @@ class ProfileChooserView : public content::WebContentsDelegate,
// Creates the main profile card for the profile |avatar_item|. |is_guest|
// is used to determine whether to show any Sign in/Sign out/Manage accounts
// links.
- views::View* CreateCurrentProfileView(
- const AvatarMenu::Item& avatar_item,
- bool is_guest);
views::View* CreateMaterialDesignCurrentProfileView(
const AvatarMenu::Item& avatar_item,
bool is_guest);
@@ -256,10 +244,6 @@ class ProfileChooserView : public content::WebContentsDelegate,
views::LabelButton* signin_current_profile_button_;
views::LabelButton* auth_error_email_button_;
- // The profile name and photo in the active profile card in non-material-
- // design user menu. Owned by the views hierarchy.
- EditableProfilePhoto* current_profile_photo_;
- EditableProfileName* current_profile_name_;
// For material design user menu, the active profile card owns the profile
// name and photo.
views::LabelButton* current_profile_card_;

Powered by Google App Engine
This is Rietveld 408576698