Move profile_chooser enums to a constant place for mac and win.

chrome/browser/ui/views/profiles/profile_chooser_view.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
 
 #include <map>
 #include <vector>
 
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/profile_chooser_constants.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #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;
 
@@ skipping 13 matching lines @@
 // This bubble view is displayed when the user clicks on the avatar button.
 // It displays a list of profiles and allows users to switch between profiles.
 class ProfileChooserView : public views::BubbleDelegateView,
                            public views::ButtonListener,
                            public views::LinkListener,
                            public views::StyledLabelListener,
                            public views::TextfieldController,
                            public AvatarMenuObserver,
                            public OAuth2TokenService::Observer {
  public:
-  // Different views that can be displayed in the bubble.
-  enum BubbleViewMode {
-    // Shows a "fast profile switcher" view.
-    BUBBLE_VIEW_MODE_PROFILE_CHOOSER,
-    // Shows a list of accounts for the active user.
-    BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT,
-    // Shows a web view for primary sign in.
-    BUBBLE_VIEW_MODE_GAIA_SIGNIN,
-    // Shows a web view for adding secondary accounts.
-    BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT,
-    // Shows a view for confirming account removal.
-    BUBBLE_VIEW_MODE_ACCOUNT_REMOVAL,
-    // Shows a view for ending new profile management preview.
-    BUBBLE_VIEW_MODE_END_PREVIEW
-  };
-
-  enum TutorialMode {
-    TUTORIAL_MODE_NONE,             // No tutorial card shown.
-    TUTORIAL_MODE_ENABLE_PREVIEW,   // The enable-mirror-preview tutorial shown.
-    TUTORIAL_MODE_PREVIEW_ENABLED,  // The welcome-to-mirror tutorial shown.

[msw, 2014/05/21 19:42:47]

This was intentionally changed to TUTORIAL_MODE_WELCOME, right?

[Mike Lerman, 2014/05/21 19:53:10]

Correct. There was a discrepancy between the views and the cocoa, and after
discussion with guohui@ we went with _WELCOME, which was the result of previous
discussion she's had.

-    TUTORIAL_MODE_SEND_FEEDBACK     // The send-feedback tutorial shown.
-  };
-
   // Shows the bubble if one is not already showing.  This allows us to easily
   // make a button toggle the bubble on and off when clicked: we unconditionally
   // call this function when the button is clicked and if the bubble isn't
   // showing it will appear while if it is showing, nothing will happen here and
   // the existing bubble will auto-close due to focus loss.
-  static void ShowBubble(BubbleViewMode view_mode,
+  static void ShowBubble(profiles::BubbleViewMode view_mode,
                          views::View* anchor_view,
                          views::BubbleBorder::Arrow arrow,
                          views::BubbleBorder::BubbleAlignment border_alignment,
                          const gfx::Rect& anchor_rect,
                          Browser* browser);
   static bool IsShowing();
   static void Hide();
 
   // We normally close the bubble any time it becomes inactive but this can lead
   // to flaky tests where unexpected UI events are triggering this behavior.
   // Tests should call this with "false" for more consistent operation.
   static void clear_close_on_deactivate_for_testing() {
     close_on_deactivate_for_testing_ = false;
   }
 
  private:
   friend class NewAvatarMenuButtonTest;
   FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut);
 
   typedef std::vector<size_t> Indexes;
   typedef std::map<views::Button*, int> ButtonIndexes;
   typedef std::map<views::Button*, std::string> AccountButtonIndexes;
 
   ProfileChooserView(views::View* anchor_view,
                      views::BubbleBorder::Arrow arrow,
                      const gfx::Rect& anchor_rect,
                      Browser* browser,
-                     BubbleViewMode view_mode);
+                     profiles::BubbleViewMode view_mode);
   virtual ~ProfileChooserView();
 
   // views::BubbleDelegateView:
   virtual void Init() OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
@@ skipping 14 matching lines @@
   // OAuth2TokenService::Observer overrides.
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
   virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
 
   static ProfileChooserView* profile_bubble_;
   static bool close_on_deactivate_for_testing_;
 
   void ResetView();
 
   // Shows the bubble with the |view_to_display|.
-  void ShowView(BubbleViewMode view_to_display,
+  void ShowView(profiles::BubbleViewMode view_to_display,
                 AvatarMenu* avatar_menu);
 
   // Creates the profile chooser view. |tutorial_shown| indicates if the "mirror
   // enabled" tutorial was shown or not in the last active view.
   views::View* CreateProfileChooserView(AvatarMenu* avatar_menu,
-                                        TutorialMode last_tutorial_mode);
+      profiles::TutorialMode last_tutorial_mode);
 
   // 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* CreateGuestProfileView();
   views::View* CreateOtherProfilesView(const Indexes& avatars_to_show);
   views::View* CreateOptionsView(bool enable_lock);
@@ skipping 29 matching lines @@
   // Creates a a tutorial card at the top prompting the user to send feedback
   // about the new profile management preview and/or to end preview.
   views::View* CreateSendPreviewFeedbackView();
 
   // Creates a tutorial card with the specified |title_text|, |context_text|,
   // and a bottom row with a right-aligned link using the specified |link_text|,
   // and a left aligned button using the specified |button_text|. The method
   // sets |link| to point to the newly created link, |button| to the newly
   // created button, and |tutorial_mode_| to the given |tutorial_mode|.
   views::View* CreateTutorialView(
-      TutorialMode tutorial_mode,
+      profiles::TutorialMode tutorial_mode,
       const base::string16& title_text,
       const base::string16& content_text,
       const base::string16& link_text,
       const base::string16& button_text,
       views::Link** link,
       views::LabelButton** button);
 
   views::View* CreateEndPreviewView();
 
   scoped_ptr<AvatarMenu> avatar_menu_;
@@ skipping 35 matching lines @@
   views::ImageButton* account_removal_cancel_button_;
 
   // Links and buttons displayed in the end-preview view.
   views::LabelButton* end_preview_and_relaunch_button_;
   views::ImageButton* end_preview_cancel_button_;
 
   // Records the account id to remove.
   std::string account_id_to_remove_;
 
   // Active view mode.
-  BubbleViewMode view_mode_;
+  profiles::BubbleViewMode view_mode_;
 
   // The current tutorial mode.
-  TutorialMode tutorial_mode_;
+  profiles::TutorialMode tutorial_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_