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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc

Issue 9695029: Change the login flow for kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/number_formatting.h" 8 #include "base/i18n/number_formatting.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/chromeos/login/user_manager.h"
10 #include "chrome/browser/task_manager/task_manager.h" 11 #include "chrome/browser/task_manager/task_manager.h"
11 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
12 #include "grit/chromium_strings.h" 13 #include "grit/chromium_strings.h"
13 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
14 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
15 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
17 18
18 void WrenchMenuModel::Build() { 19 void WrenchMenuModel::Build() {
19 AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); 20 AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 66
66 // Show IDC_FEEDBACK in top-tier wrench menu for ChromeOS. 67 // Show IDC_FEEDBACK in top-tier wrench menu for ChromeOS.
67 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); 68 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
68 69
69 AddGlobalErrorMenuItems(); 70 AddGlobalErrorMenuItems();
70 71
71 AddSeparator(); 72 AddSeparator();
72 73
73 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { 74 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
74 AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE); 75 AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE);
76 AddItemWithStringId(IDC_SHUTDOWN, IDS_SHUTDOWN_BUTTON);
77 } else if (chromeos::UserManager::Get()->IsLoggedInAsDemoUser()) {
78 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
75 } else { 79 } else {
76 AddItemWithStringId(IDC_LOCK_SCREEN, IDS_LOCK_SCREEN); 80 AddItemWithStringId(IDC_LOCK_SCREEN, IDS_LOCK_SCREEN);
77 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT); 81 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
82 AddItemWithStringId(IDC_SHUTDOWN, IDS_SHUTDOWN_BUTTON);
78 } 83 }
79
80 AddItemWithStringId(IDC_SHUTDOWN, IDS_SHUTDOWN_BUTTON);
81 } 84 }
82 85
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698