| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
 | 
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
 | 
| index ac035cf2f4e6e4ec9bc367bcce3858ff1a98a9bf..fd85fcc8745cdf59c93e87322518bda129aff961 100644
 | 
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 | 
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 | 
| @@ -66,6 +66,7 @@
 | 
|  #include "ui/base/hit_test.h"
 | 
|  #include "ui/base/ime/input_method.h"
 | 
|  #include "ui/base/ui_base_types.h"
 | 
| +#include "ui/compositor/compositor_vsync_manager.h"
 | 
|  #include "ui/compositor/dip_util.h"
 | 
|  #include "ui/events/blink/blink_event_util.h"
 | 
|  #include "ui/events/event.h"
 | 
| @@ -443,7 +444,6 @@
 | 
|        has_snapped_to_boundary_(false),
 | 
|        touch_editing_client_(NULL),
 | 
|        is_guest_view_hack_(is_guest_view_hack),
 | 
| -      begin_frame_observer_proxy_(this),
 | 
|        weak_ptr_factory_(this) {
 | 
|    if (!is_guest_view_hack_)
 | 
|      host_->SetView(this);
 | 
| @@ -473,8 +473,6 @@
 | 
|      // RenderWidgetHostViewAndroid should also be moved at the same time.
 | 
|      IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged,
 | 
|                          OnTextInputStateChanged)
 | 
| -    IPC_MESSAGE_HANDLER(ViewHostMsg_SetNeedsBeginFrames,
 | 
| -                        OnSetNeedsBeginFrames)
 | 
|      IPC_MESSAGE_UNHANDLED(handled = false)
 | 
|    IPC_END_MESSAGE_MAP()
 | 
|    return handled;
 | 
| @@ -702,15 +700,6 @@
 | 
|  
 | 
|  ui::TextInputClient* RenderWidgetHostViewAura::GetTextInputClient() {
 | 
|    return this;
 | 
| -}
 | 
| -
 | 
| -void RenderWidgetHostViewAura::OnSetNeedsBeginFrames(bool needs_begin_frames) {
 | 
| -  begin_frame_observer_proxy_.SetNeedsBeginFrames(needs_begin_frames);
 | 
| -}
 | 
| -
 | 
| -void RenderWidgetHostViewAura::SendBeginFrame(const cc::BeginFrameArgs& args) {
 | 
| -  delegated_frame_host_->SetVSyncParameters(args.frame_time, args.interval);
 | 
| -  host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
 | 
|  }
 | 
|  
 | 
|  void RenderWidgetHostViewAura::SetKeyboardFocus() {
 | 
| @@ -2640,8 +2629,6 @@
 | 
|  #endif
 | 
|  
 | 
|    delegated_frame_host_->SetCompositor(window_->GetHost()->compositor());
 | 
| -  if (window_->GetHost()->compositor())
 | 
| -    begin_frame_observer_proxy_.SetCompositor(window_->GetHost()->compositor());
 | 
|  }
 | 
|  
 | 
|  void RenderWidgetHostViewAura::RemovingFromRootWindow() {
 | 
| @@ -2654,7 +2641,6 @@
 | 
|  
 | 
|    window_->GetHost()->RemoveObserver(this);
 | 
|    delegated_frame_host_->ResetCompositor();
 | 
| -  begin_frame_observer_proxy_.ResetCompositor();
 | 
|  
 | 
|  #if defined(OS_WIN)
 | 
|    // Update the legacy window's parent temporarily to the desktop window. It
 | 
| @@ -2766,6 +2752,12 @@
 | 
|    host_->ScheduleComposite();
 | 
|  }
 | 
|  
 | 
| +void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters(
 | 
| +    const base::TimeTicks& timebase,
 | 
| +    const base::TimeDelta& interval) {
 | 
| +  host_->UpdateVSyncParameters(timebase, interval);
 | 
| +}
 | 
| +
 | 
|  void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() {
 | 
|    ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
 | 
|  }
 | 
| 
 |