Re-land:

chrome/browser/ui/views/first_run_bubble.cc

 // Copyright (c) 2011 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/first_run_bubble.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 473 matching lines @@
       break;
     case FirstRun::MINIMAL_BUBBLE:
       view = new FirstRunMinimalBubbleView(bubble, profile);
       break;
     default:
       NOTREACHED();
   }
   bubble->set_view(view);
   bubble->InitBubble(
       parent, position_relative_to, arrow_location, view, bubble);
-  bubble->GetFocusManager()->AddFocusChangeListener(view);
+  bubble->GetWidget()->GetFocusManager()->AddFocusChangeListener(view);
   view->BubbleShown();
   return bubble;
 }
 
 FirstRunBubble::FirstRunBubble()
     : has_been_activated_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(enable_window_method_factory_(this)),
       view_(NULL) {
 }
 
 FirstRunBubble::~FirstRunBubble() {
   enable_window_method_factory_.RevokeAll();
-  GetFocusManager()->RemoveFocusChangeListener(view_);
+  GetWidget()->GetFocusManager()->RemoveFocusChangeListener(view_);
 }
 
 void FirstRunBubble::EnableParent() {
   ::EnableWindow(GetParent(), true);
   // The EnableWindow() call above causes the parent to become active, which
   // resets the flag set by Bubble's call to DisableInactiveRendering(), so we
   // have to call it again before activating the bubble to prevent the parent
   // window from rendering inactive.
   // TODO(beng): this only works in custom-frame mode, not glass-frame mode.
   views::NativeWidget* parent =
       views::NativeWidget::GetNativeWidgetForNativeView(GetParent());
   if (parent)
-    parent->GetWidget()->GetWindow()->DisableInactiveRendering();
+    parent->GetWidget()->GetContainingWindow()->DisableInactiveRendering();
   // Reactivate the FirstRunBubble so it responds to OnActivate messages.
   SetWindowPos(GetParent(), 0, 0, 0, 0,
                SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | SWP_SHOWWINDOW);
 }
 
 void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
   // Keep the bubble around for kLingerTime milliseconds, to prevent accidental
   // closure.
   const int kLingerTime = 3000;
 
@@ skipping 15 matching lines @@
   // Keep window from automatically closing until kLingerTime has passed.
   if (::IsWindowEnabled(GetParent()))
     Bubble::OnActivate(action, minimized, window);
 }
 
 void FirstRunBubble::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
 }