Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 16387003: Merge 203791 "gesture nav: Disable for M28." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 process_->Attach(this, routing_id_); 193 process_->Attach(this, routing_id_);
194 // Because the widget initializes as is_hidden_ == false, 194 // Because the widget initializes as is_hidden_ == false,
195 // tell the process host that we're alive. 195 // tell the process host that we're alive.
196 process_->WidgetRestored(); 196 process_->WidgetRestored();
197 197
198 accessibility_mode_ = 198 accessibility_mode_ =
199 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode(); 199 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode();
200 200
201 #if defined(USE_AURA) 201 #if defined(USE_AURA)
202 bool overscroll_enabled = CommandLine::ForCurrentProcess()-> 202 bool overscroll_enabled = CommandLine::ForCurrentProcess()->
203 GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0"; 203 GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1";
204 SetOverscrollControllerEnabled(overscroll_enabled); 204 SetOverscrollControllerEnabled(overscroll_enabled);
205 #endif 205 #endif
206 } 206 }
207 207
208 RenderWidgetHostImpl::~RenderWidgetHostImpl() { 208 RenderWidgetHostImpl::~RenderWidgetHostImpl() {
209 SetView(NULL); 209 SetView(NULL);
210 210
211 // Clear our current or cached backing store if either remains. 211 // Clear our current or cached backing store if either remains.
212 BackingStoreManager::RemoveBackingStore(this); 212 BackingStoreManager::RemoveBackingStore(this);
213 213
(...skipping 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 return; 2399 return;
2400 2400
2401 OnRenderAutoResized(new_size); 2401 OnRenderAutoResized(new_size);
2402 } 2402 }
2403 2403
2404 void RenderWidgetHostImpl::DetachDelegate() { 2404 void RenderWidgetHostImpl::DetachDelegate() {
2405 delegate_ = NULL; 2405 delegate_ = NULL;
2406 } 2406 }
2407 2407
2408 } // namespace content 2408 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | content/browser/web_contents/web_contents_screenshot_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698