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

chrome/renderer/chrome_render_view_observer.h

 // 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.
 
 #ifndef CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 54 matching lines @@
     bool notify_result;
   };
 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidStartLoading() OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
   virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
                                         bool is_new_navigation) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
-  virtual void DidHandleGestureEvent(
-      const WebKit::WebGestureEvent& event) OVERRIDE;
   virtual void DetailedConsoleMessageAdded(const base::string16& message,
                                            const base::string16& source,
                                            const base::string16& stack_trace,
                                            int32 line_number,
                                            int32 severity_level) OVERRIDE;
 
   // WebKit::WebPermissionClient implementation.
   virtual bool allowDatabase(WebKit::WebFrame* frame,
                              const WebKit::WebString& name,
                              const WebKit::WebString& display_name,
@@ skipping 120 matching lines @@
   // A color page overlay when visually de-emaphasized.
   scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_;
 
   // Used to delay calling CapturePageInfo.
   base::Timer capture_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver);
 };
 
 #endif  // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_