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

Side by Side Diff: chrome/browser/profiles/profile_window.h

Issue 631163004: Mac - show user manager before opening browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use different app_controller_mac method. use different TaskMgr call. Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/profiles/profile_metrics.h" 10 #include "chrome/browser/profiles/profile_metrics.h"
(...skipping 12 matching lines...) Expand all
23 USER_MANAGER_NO_TUTORIAL, // Does not display a tutorial. 23 USER_MANAGER_NO_TUTORIAL, // Does not display a tutorial.
24 USER_MANAGER_TUTORIAL_OVERVIEW, // Basic overview of new features. 24 USER_MANAGER_TUTORIAL_OVERVIEW, // Basic overview of new features.
25 USER_MANAGER_TUTORIAL_LOCK, // TODO(noms): To be implemented. 25 USER_MANAGER_TUTORIAL_LOCK, // TODO(noms): To be implemented.
26 }; 26 };
27 27
28 // Different actions to perform after the user manager selects a profile. 28 // Different actions to perform after the user manager selects a profile.
29 enum UserManagerProfileSelected { 29 enum UserManagerProfileSelected {
30 USER_MANAGER_SELECT_PROFILE_NO_ACTION, 30 USER_MANAGER_SELECT_PROFILE_NO_ACTION,
31 USER_MANAGER_SELECT_PROFILE_TASK_MANAGER, 31 USER_MANAGER_SELECT_PROFILE_TASK_MANAGER,
32 USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME, 32 USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME,
33 USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS,
33 }; 34 };
34 35
35 extern const char kUserManagerDisplayTutorial[]; 36 extern const char kUserManagerDisplayTutorial[];
36 extern const char kUserManagerSelectProfileTaskManager[]; 37 extern const char kUserManagerSelectProfileTaskManager[];
37 extern const char kUserManagerSelectProfileAboutChrome[]; 38 extern const char kUserManagerSelectProfileAboutChrome[];
39 extern const char kUserManagerSelectProfileChromeSettings[];
38 40
39 // Activates a window for |profile| on the desktop specified by 41 // Activates a window for |profile| on the desktop specified by
40 // |desktop_type|. If no such window yet exists, or if |always_create| is 42 // |desktop_type|. If no such window yet exists, or if |always_create| is
41 // true, this first creates a new window, then activates 43 // true, this first creates a new window, then activates
42 // that. If activating an exiting window and multiple windows exists then the 44 // that. If activating an exiting window and multiple windows exists then the
43 // window that was most recently active is activated. This is used for 45 // window that was most recently active is activated. This is used for
44 // creation of a window from the multi-profile dropdown menu. 46 // creation of a window from the multi-profile dropdown menu.
45 void FindOrCreateNewWindowForProfile( 47 void FindOrCreateNewWindowForProfile(
46 Profile* profile, 48 Profile* profile,
47 chrome::startup::IsProcessStartup process_startup, 49 chrome::startup::IsProcessStartup process_startup,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // Converts from modes in the avatar menu to modes understood by 109 // Converts from modes in the avatar menu to modes understood by
108 // ProfileChooserView. 110 // ProfileChooserView.
109 void BubbleViewModeFromAvatarBubbleMode( 111 void BubbleViewModeFromAvatarBubbleMode(
110 BrowserWindow::AvatarBubbleMode mode, 112 BrowserWindow::AvatarBubbleMode mode,
111 BubbleViewMode* bubble_view_mode, 113 BubbleViewMode* bubble_view_mode,
112 TutorialMode* tutorial_mode); 114 TutorialMode* tutorial_mode);
113 115
114 } // namespace profiles 116 } // namespace profiles
115 117
116 #endif // CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ 118 #endif // CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698