Merge 237646 "Ensure that the OSK on Windows 8 shows up when we ..."

chrome/browser/ui/tab_contents/core_tab_helper.cc

 // Copyright (c) 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/tab_contents/core_tab_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_states.h"
 #include "net/http/http_request_headers.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
-#if defined(OS_WIN)
-#include "base/win/win_util.h"
-#endif
-
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(CoreTabHelper);
 
 CoreTabHelper::CoreTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       delegate_(NULL),
       content_restrictions_(0) {
 }
 
@@ skipping 140 matching lines @@
   before_unload_end_time_ = proceed_time;
 }
 
 void CoreTabHelper::BeforeUnloadDialogCancelled() {
   OnCloseCanceled();
 }
 
 bool CoreTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(CoreTabHelper, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FocusedNodeTouched,
-                        OnFocusedNodeTouched)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RequestThumbnailForContextNode_ACK,
                         OnRequestThumbnailForContextNodeACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void CoreTabHelper::OnFocusedNodeTouched(bool editable) {
-#if defined(OS_WIN) && defined(USE_AURA)
-  if (editable) {
-    base::win::DisplayVirtualKeyboard();
-  } else {
-    base::win::DismissVirtualKeyboard();
-  }
-#endif  // OS_WIN && USE_AURA
-}
-
 // Handles the image thumbnail for the context node, composes a image search
 // request based on the received thumbnail and opens the request in a new tab.
 void CoreTabHelper::OnRequestThumbnailForContextNodeACK(
     const SkBitmap& bitmap,
     const gfx::Size& original_size) {
   if (bitmap.isNull())
     return;
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 
@@ skipping 37 matching lines @@
     DCHECK(!content_type.empty());
     open_url_params.uses_post = true;
     open_url_params.browser_initiated_post_data =
         base::RefCountedString::TakeString(post_data);
     open_url_params.extra_headers += base::StringPrintf(
         "%s: %s\r\n", net::HttpRequestHeaders::kContentType,
         content_type.c_str());
   }
   web_contents()->OpenURL(open_url_params);
 }