Update avatar icon when nonclient frame view is added to view hierarchy.

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

 // Copyright 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.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 609 matching lines @@
   return profiles::IsRegularOrGuestSession(browser_.get());
 }
 
 bool BrowserView::ShouldShowAvatar() const {
 #if defined(OS_CHROMEOS)
   if (!browser_->is_type_tabbed() && !browser_->is_app())
     return false;
   // Don't show incognito avatar in the guest session.
   if (IsOffTheRecord() && !IsGuestSession())
     return true;
-  // This function is called via BrowserNonClientFrameView::UpdateAvatarInfo
-  // during the creation of the BrowserWindow, so browser->window() will not
-  // yet be set. In this case we can safely return false.
-  if (!browser_->window())
-    return false;
-  return chrome::MultiUserWindowManager::ShouldShowAvatar(
-      browser_->window()->GetNativeWindow());
+  return chrome::MultiUserWindowManager::ShouldShowAvatar(GetNativeWindow());
 #else
   if (!IsBrowserTypeNormal())
     return false;
   if (IsOffTheRecord())  // Desktop guest is incognito and needs avatar.
     return true;
   // Tests may not have a profile manager.
   if (!g_browser_process->profile_manager())
     return false;
   ProfileAttributesEntry* entry;
   if (!g_browser_process->profile_manager()->GetProfileAttributesStorage().
@@ skipping 117 matching lines @@
   return false;
 }
 
 void BrowserView::SetAlwaysOnTop(bool always_on_top) {
   // Not implemented for browser windows.
   NOTIMPLEMENTED();
 }
 
 gfx::NativeWindow BrowserView::GetNativeWindow() const {
   // While the browser destruction is going on, the widget can already be gone,
-  // but utility functions like FindBrowserWithWindow will come here and crash.
-  // We short circuit therefore.
-  if (!GetWidget())
-    return nullptr;
-  return GetWidget()->GetTopLevelWidget()->GetNativeWindow();
+  // but utility functions like FindBrowserWithWindow will still call this.
+  return GetWidget() ? GetWidget()->GetNativeWindow() : nullptr;
 }
 
 StatusBubble* BrowserView::GetStatusBubble() {
   return status_bubble_.get();
 }
 
 namespace {
   // Only used by ToolbarSizeChanged() below, but placed here because template
   // arguments (to base::AutoReset<>) must have external linkage.
   enum CallState { NORMAL, REENTRANT, REENTRANT_FORCE_FAST_RESIZE };
@@ skipping 461 matching lines @@
 }
 
 gfx::Rect BrowserView::GetRootWindowResizerRect() const {
   // Views does not support resizer rects because they caused page cycler
   // performance regressions when they were added. See crrev.com/9654
   return gfx::Rect();
 }
 
 void BrowserView::ConfirmAddSearchProvider(TemplateURL* template_url,
                                            Profile* profile) {
-  chrome::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url,
-                           nullptr, profile);
+  chrome::EditSearchEngine(GetNativeWindow(), template_url, nullptr, profile);
 }
 
 void BrowserView::ShowUpdateChromeDialog() {
-  UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow());
+  UpdateRecommendedMessageBox::Show(GetNativeWindow());
 }
 
 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
   scoped_ptr<BubbleSyncPromoDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get()));
 
   views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor();
   views::Widget* bubble_widget = BookmarkBubbleView::ShowBubble(
       anchor_view, gfx::Rect(), nullptr, bookmark_bar_view_.get(),
       std::move(delegate), browser_->profile(), url, already_bookmarked);
@@ skipping 1435 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }