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

Unified Diff: chrome/browser/ui/webui/ntp/ntp_login_handler.cc

Issue 9500003: Add a button to exit managed mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/ntp_login_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
index ec17dc2b6d6d5ec4d9a4f2abc9eeebb92c206cc6..9c51c9d51b26a8c3763535694d83f00584d6c351 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
@@ -11,7 +11,9 @@
#include "base/metrics/histogram.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/managed_mode.h"
#include "chrome/browser/prefs/pref_notifier.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -137,7 +139,9 @@ void NTPLoginHandler::HandleShowSyncLoginUI(const ListValue* args) {
RecordInHistogram(NTP_SIGN_IN_PROMO_CLICKED);
}
#endif
- } else if (args->GetSize() == 4) {
+ } else if (args->GetSize() == 4 &&
+ browser->command_updater()->IsCommandEnabled(
+ IDC_SHOW_AVATAR_MENU)) {
Dan Beam 2013/08/12 19:40:28 bauerb@: ^ why was this check added? this means t
// The user is signed in, show the profiles menu.
double x = 0;
double y = 0;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698