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

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

Issue 8842002: Remove lock screen item from menu and disable screen lock on guest session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change VLOG to DVLOG in ScreenLocker::Show. Created 9 years 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/login/screen_locker.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/task_manager/task_manager.h" 10 #include "chrome/browser/task_manager/task_manager.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE), 65 SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE),
66 *rb.GetBitmapNamed(IDR_HELP_MENU)); 66 *rb.GetBitmapNamed(IDR_HELP_MENU));
67 67
68 // Show IDC_FEEDBACK in top-tier wrench menu for ChromeOS. 68 // Show IDC_FEEDBACK in top-tier wrench menu for ChromeOS.
69 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); 69 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
70 70
71 AddGlobalErrorMenuItems(); 71 AddGlobalErrorMenuItems();
72 72
73 AddSeparator(); 73 AddSeparator();
74 74
75 AddItemWithStringId(IDC_LOCK_SCREEN, IDS_LOCK_SCREEN);
76
77 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { 75 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
78 AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE); 76 AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE);
79 } else { 77 } else {
78 AddItemWithStringId(IDC_LOCK_SCREEN, IDS_LOCK_SCREEN);
80 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT); 79 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
81 } 80 }
82 } 81 }
83 82
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698