Integrate the new input method API for Views into Chromium.

views/focus/focus_manager.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "views/focus/focus_manager.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 
 #if defined(OS_LINUX)
@@ skipping 349 matching lines @@
         // This usually just sets the focus if this view is focusable, but
         // let the view override RequestFocus if necessary.
         view->RequestFocus();
 
         // If it succeeded, the reason would be incorrect; set it to
         // focus restore.
         if (focused_view_ == view)
           focus_change_reason_ = kReasonFocusRestore;
       }
     }
-  } else {
-    // Clearing the focus will focus the root window, so we still get key
-    // events.
-    ClearFocus();
   }
 }
 
 void FocusManager::ClearStoredFocusedView() {
   ViewStorage* view_storage = ViewStorage::GetInstance();
   if (!view_storage) {
     // This should never happen but bug 981648 seems to indicate it could.
     NOTREACHED();
     return;
   }
@@ skipping 119 matching lines @@
       std::find(focus_change_listeners_.begin(), focus_change_listeners_.end(),
                 listener);
   if (place == focus_change_listeners_.end()) {
     NOTREACHED() << "Removing a listener that isn't registered.";
     return;
   }
   focus_change_listeners_.erase(place);
 }
 
 }  // namespace views