Re-land:

views/focus/focus_manager_gtk.cc

 // Copyright (c) 2006-2009 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 <gtk/gtk.h>
 
 #include "views/focus/focus_manager.h"
 
 #include "base/logging.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/window_gtk.h"
 
 namespace views {
 
 void FocusManager::ClearNativeFocus() {
-  static_cast<WidgetGtk*>(widget_)->ClearNativeFocus();
+  static_cast<WidgetGtk*>(widget_->native_widget())->ClearNativeFocus();
 }
 
 void FocusManager::FocusNativeView(gfx::NativeView native_view) {
   if (native_view && !gtk_widget_is_focus(native_view))
     gtk_widget_grab_focus(native_view);
 }
 
 // static
 FocusManager* FocusManager::GetFocusManagerForNativeView(
     gfx::NativeView native_view) {
@@ skipping 14 matching lines @@
   return focus_manager;
 }
 
 // static
 FocusManager* FocusManager::GetFocusManagerForNativeWindow(
     gfx::NativeWindow native_window) {
   return GetFocusManagerForNativeView(GTK_WIDGET(native_window));
 }
 
 }  // namespace views