| 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_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1412 // actually tick a fling animation. Report no consumer to convey this. | 1412 // actually tick a fling animation. Report no consumer to convey this. |
| 1413 if (consumed && input_event.type == blink::WebInputEvent::GestureFlingStart) | 1413 if (consumed && input_event.type == blink::WebInputEvent::GestureFlingStart) |
| 1414 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; | 1414 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; |
| 1415 | 1415 |
| 1416 return consumed ? INPUT_EVENT_ACK_STATE_CONSUMED | 1416 return consumed ? INPUT_EVENT_ACK_STATE_CONSUMED |
| 1417 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 1417 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 1418 } | 1418 } |
| 1419 | 1419 |
| 1420 BrowserAccessibilityManager* | 1420 BrowserAccessibilityManager* |
| 1421 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( | 1421 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( |
| 1422 BrowserAccessibilityDelegate* delegate) { | 1422 BrowserAccessibilityDelegate* delegate, bool for_root_frame) { |
| 1423 BrowserAccessibilityManager* manager = NULL; | 1423 BrowserAccessibilityManager* manager = NULL; |
| 1424 #if defined(OS_WIN) | 1424 #if defined(OS_WIN) |
| 1425 manager = new BrowserAccessibilityManagerWin( | 1425 manager = new BrowserAccessibilityManagerWin( |
| 1426 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); | 1426 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); |
| 1427 #else | 1427 #else |
| 1428 manager = BrowserAccessibilityManager::Create( | 1428 manager = BrowserAccessibilityManager::Create( |
| 1429 BrowserAccessibilityManager::GetEmptyDocument(), delegate); | 1429 BrowserAccessibilityManager::GetEmptyDocument(), delegate); |
| 1430 #endif | 1430 #endif |
| 1431 return manager; | 1431 return manager; |
| 1432 } | 1432 } |
| (...skipping 1696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3129 | 3129 |
| 3130 //////////////////////////////////////////////////////////////////////////////// | 3130 //////////////////////////////////////////////////////////////////////////////// |
| 3131 // RenderWidgetHostViewBase, public: | 3131 // RenderWidgetHostViewBase, public: |
| 3132 | 3132 |
| 3133 // static | 3133 // static |
| 3134 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3134 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3135 GetScreenInfoForWindow(results, NULL); | 3135 GetScreenInfoForWindow(results, NULL); |
| 3136 } | 3136 } |
| 3137 | 3137 |
| 3138 } // namespace content | 3138 } // namespace content |
| OLD | NEW |