Change profile menu button to avatar button

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 88024)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -465,8 +465,12 @@
   return browser_->profile()->IsOffTheRecord();
 }
 
-bool BrowserView::ShouldShowOffTheRecordAvatar() const {
-  return IsOffTheRecord() && IsBrowserTypeNormal();
+bool BrowserView::ShouldShowAvatar() const {
+  if (!IsBrowserTypeNormal())

[sky, 2011/06/09 15:46:46]

nit: use a single return, eg:

return IsBrowserTypeNormal() && (IsOffTheRecord() || blah blah blah

[sail, 2011/06/10 00:56:20]

Done.

+    return false;
+  if (IsOffTheRecord())
+    return true;
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
 }
 
 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {