Also hide incognito switcher when no regular window is available.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ skipping 295 matching lines @@
   views::View::ConvertPointToTarget(browser_view_->parent(), browser_view_,
                                   &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
 
   tabstrip_->SetVisible(true);
   tabstrip_->SetBoundsRect(tabstrip_bounds);
   int bottom = tabstrip_bounds.bottom();
 
   // The metro window switcher sits at the far right edge of the tabstrip
   // a |kWindowSwitcherOffsetX| pixels from the right edge.
-  // Only visible if there is an incognito window because switching between
-  // regular and incognito windows is the only use case that works right now.
+  // Only visible if there is both an incognito window AND a regular window
+  // because switching between regular and incognito windows is the only use
+  // case that works right now.

[Peter Kasting, 2012/08/24 22:19:32]

Nit: Is there some sort of applicable "TODO: Expand this to X Y Z" here?

   views::Button* switcher_button = browser_view_->window_switcher_button_;
   if (switcher_button) {
-    if (browser_view_->browser()->profile()->HasOffTheRecordProfile()) {
+    if (browser_view_->browser()->profile()->HasOffTheRecordProfile() &&

[Peter Kasting, 2012/08/24 22:19:32]

Nit: Switch all "browser_view_->browser()" calls to "browser()"

+        browser::FindBrowserWithProfile(
+            browser_view_->browser()->profile()->GetOriginalProfile(),
+            browser_view_->browser()->host_desktop_type()) != NULL) {
       switcher_button->SetVisible(true);
       int width = browser_view_->width();
       gfx::Size ps = switcher_button->GetPreferredSize();
       if (width > ps.width()) {
         switcher_button->SetBounds(width - ps.width() - kWindowSwitcherOffsetX,
                                    0,
                                    ps.width(),
                                    ps.height());
       }
     } else {
@@ skipping 141 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container_->GetPreferredSize().height() != 0);
 }