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

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

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted@: test fixes and remove a const-ref. Created 5 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/chrome_browser_main_mac.mm ('k') | chrome/browser/profiles/profile_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 14 matching lines...) Expand all
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 USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS,
34 USER_MANAGER_SELECT_PROFILE_CHROME_MEMORY, 34 USER_MANAGER_SELECT_PROFILE_CHROME_MEMORY,
35 USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER,
35 }; 36 };
36 37
37 extern const char kUserManagerDisplayTutorial[]; 38 extern const char kUserManagerDisplayTutorial[];
38 extern const char kUserManagerSelectProfileTaskManager[]; 39 extern const char kUserManagerSelectProfileTaskManager[];
39 extern const char kUserManagerSelectProfileAboutChrome[]; 40 extern const char kUserManagerSelectProfileAboutChrome[];
40 extern const char kUserManagerSelectProfileChromeSettings[]; 41 extern const char kUserManagerSelectProfileChromeSettings[];
41 extern const char kUserManagerSelectProfileChromeMemory[]; 42 extern const char kUserManagerSelectProfileChromeMemory[];
43 extern const char kUserManagerSelectProfileAppLauncher[];
42 44
43 // Activates a window for |profile| on the desktop specified by 45 // Activates a window for |profile| on the desktop specified by
44 // |desktop_type|. If no such window yet exists, or if |always_create| is 46 // |desktop_type|. If no such window yet exists, or if |always_create| is
45 // true, this first creates a new window, then activates 47 // true, this first creates a new window, then activates
46 // that. If activating an exiting window and multiple windows exists then the 48 // that. If activating an exiting window and multiple windows exists then the
47 // window that was most recently active is activated. This is used for 49 // window that was most recently active is activated. This is used for
48 // creation of a window from the multi-profile dropdown menu. 50 // creation of a window from the multi-profile dropdown menu.
49 void FindOrCreateNewWindowForProfile( 51 void FindOrCreateNewWindowForProfile(
50 Profile* profile, 52 Profile* profile,
51 chrome::startup::IsProcessStartup process_startup, 53 chrome::startup::IsProcessStartup process_startup,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // Converts from modes in the avatar menu to modes understood by 113 // Converts from modes in the avatar menu to modes understood by
112 // ProfileChooserView. 114 // ProfileChooserView.
113 void BubbleViewModeFromAvatarBubbleMode( 115 void BubbleViewModeFromAvatarBubbleMode(
114 BrowserWindow::AvatarBubbleMode mode, 116 BrowserWindow::AvatarBubbleMode mode,
115 BubbleViewMode* bubble_view_mode, 117 BubbleViewMode* bubble_view_mode,
116 TutorialMode* tutorial_mode); 118 TutorialMode* tutorial_mode);
117 119
118 } // namespace profiles 120 } // namespace profiles
119 121
120 #endif // CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ 122 #endif // CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_mac.mm ('k') | chrome/browser/profiles/profile_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698