OLD | NEW |
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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 } | 178 } |
179 | 179 |
180 is_threaded_compositing_enabled_ = IsThreadedCompositingEnabled(); | 180 is_threaded_compositing_enabled_ = IsThreadedCompositingEnabled(); |
181 | 181 |
182 process_->Attach(this, routing_id_); | 182 process_->Attach(this, routing_id_); |
183 // Because the widget initializes as is_hidden_ == false, | 183 // Because the widget initializes as is_hidden_ == false, |
184 // tell the process host that we're alive. | 184 // tell the process host that we're alive. |
185 process_->WidgetRestored(); | 185 process_->WidgetRestored(); |
186 | 186 |
187 #if defined(USE_AURA) | 187 #if defined(USE_AURA) |
188 bool overscroll_enabled = CommandLine::ForCurrentProcess()-> | 188 bool overscroll_enabled = !CommandLine::ForCurrentProcess()-> |
189 HasSwitch(switches::kEnableOverscrollHistoryNavigation); | 189 HasSwitch(switches::kDisableOverscrollHistoryNavigation); |
190 if (overscroll_enabled) | 190 if (overscroll_enabled) |
191 InitializeOverscrollController(); | 191 InitializeOverscrollController(); |
192 #endif | 192 #endif |
193 } | 193 } |
194 | 194 |
195 RenderWidgetHostImpl::~RenderWidgetHostImpl() { | 195 RenderWidgetHostImpl::~RenderWidgetHostImpl() { |
196 SetView(NULL); | 196 SetView(NULL); |
197 | 197 |
198 // Clear our current or cached backing store if either remains. | 198 // Clear our current or cached backing store if either remains. |
199 BackingStoreManager::RemoveBackingStore(this); | 199 BackingStoreManager::RemoveBackingStore(this); |
(...skipping 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2362 return; | 2362 return; |
2363 | 2363 |
2364 OnRenderAutoResized(new_size); | 2364 OnRenderAutoResized(new_size); |
2365 } | 2365 } |
2366 | 2366 |
2367 void RenderWidgetHostImpl::DetachDelegate() { | 2367 void RenderWidgetHostImpl::DetachDelegate() { |
2368 delegate_ = NULL; | 2368 delegate_ = NULL; |
2369 } | 2369 } |
2370 | 2370 |
2371 } // namespace content | 2371 } // namespace content |
OLD | NEW |