Remove dead code unnecessarily added by r231563 and 236449

ui/base/ime/input_method_imm32.cc

 // Copyright (c) 2013 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 "ui/base/ime/input_method_imm32.h"
 
 #include "base/basictypes.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/win/tsf_input_scope.h"
@@ skipping 76 matching lines @@
 
 void InputMethodIMM32::OnTextInputTypeChanged(const TextInputClient* client) {
   if (IsTextInputClientFocused(client) && IsWindowFocused(client)) {
     imm32_manager_.CancelIME(GetAttachedWindowHandle(client));
     UpdateIMEState();
   }
   InputMethodWin::OnTextInputTypeChanged(client);
 }
 
 void InputMethodIMM32::OnCaretBoundsChanged(const TextInputClient* client) {
-  if (enabled_ && IsTextInputClientFocused(client) && IsWindowFocused(client)) {
-    // The current text input type should not be NONE if |client| is focused.
-    DCHECK(!IsTextInputTypeNone());
-    gfx::Rect screen_bounds(GetTextInputClient()->GetCaretBounds());
+  if (!enabled_ || !IsTextInputClientFocused(client) ||
+      !IsWindowFocused(client)) {
+    return;
+  }
+  // The current text input type should not be NONE if |client| is focused.
+  DCHECK(!IsTextInputTypeNone());
+  gfx::Rect screen_bounds(GetTextInputClient()->GetCaretBounds());
 
-    HWND attached_window = GetAttachedWindowHandle(client);
-    // TODO(ime): see comment in TextInputClient::GetCaretBounds(), this
-    // conversion shouldn't be necessary.
-    RECT r = {};
-    GetClientRect(attached_window, &r);
-    POINT window_point = { screen_bounds.x(), screen_bounds.y() };
-    ScreenToClient(attached_window, &window_point);
-    gfx::Rect caret_rect(gfx::Point(window_point.x, window_point.y),
-                         screen_bounds.size());
-    imm32_manager_.UpdateCaretRect(attached_window, caret_rect);
-  }
-  InputMethodWin::OnCaretBoundsChanged(client);
+  HWND attached_window = GetAttachedWindowHandle(client);
+  // TODO(ime): see comment in TextInputClient::GetCaretBounds(), this
+  // conversion shouldn't be necessary.
+  RECT r = {};
+  GetClientRect(attached_window, &r);
+  POINT window_point = { screen_bounds.x(), screen_bounds.y() };
+  ScreenToClient(attached_window, &window_point);
+  gfx::Rect caret_rect(gfx::Point(window_point.x, window_point.y),
+                       screen_bounds.size());
+  imm32_manager_.UpdateCaretRect(attached_window, caret_rect);
 }
 
 void InputMethodIMM32::CancelComposition(const TextInputClient* client) {
   if (enabled_ && IsTextInputClientFocused(client))
     imm32_manager_.CancelIME(GetAttachedWindowHandle(client));
 }
 
 bool InputMethodIMM32::IsCandidatePopupOpen() const {
   return is_candidate_popup_open_;
 }
@@ skipping 153 matching lines @@
       enabled_ = true;
       break;
   }
 
   imm32_manager_.SetTextInputMode(window_handle, text_input_mode);
   tsf_inputscope::SetInputScopeForTsfUnawareWindow(
       window_handle, text_input_type, text_input_mode);
 }
 
 }  // namespace ui