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

Side by Side Diff: chrome/browser/profiles/avatar_menu.cc

Issue 64313005: Fix crash when locking a profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix return type on cros Created 7 years, 1 month 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
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/profiles/avatar_menu.h" 5 #include "chrome/browser/profiles/avatar_menu.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/i18n/case_conversion.h" 9 #include "base/i18n/case_conversion.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 void AvatarMenu::Observe(int type, 225 void AvatarMenu::Observe(int type,
226 const content::NotificationSource& source, 226 const content::NotificationSource& source,
227 const content::NotificationDetails& details) { 227 const content::NotificationDetails& details) {
228 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type); 228 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type);
229 RebuildMenu(); 229 RebuildMenu();
230 if (observer_) 230 if (observer_)
231 observer_->OnAvatarMenuChanged(this); 231 observer_->OnAvatarMenuChanged(this);
232 } 232 }
233 233
234 content::WebContents* AvatarMenu::BeginSignOut() { 234 void AvatarMenu::BeginSignOut() {
235 return menu_actions_->BeginSignOut(); 235 menu_actions_->BeginSignOut();
236 } 236 }
237
238 void AvatarMenu::SetLogoutURL(const std::string& logout_url) {
239 menu_actions_->SetLogoutURL(logout_url);
240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698