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 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1385 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 1385 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
1386 } | 1386 } |
1387 | 1387 |
1388 BrowserAccessibilityManager* | 1388 BrowserAccessibilityManager* |
1389 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( | 1389 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( |
1390 BrowserAccessibilityDelegate* delegate) { | 1390 BrowserAccessibilityDelegate* delegate) { |
1391 BrowserAccessibilityManager* manager = NULL; | 1391 BrowserAccessibilityManager* manager = NULL; |
1392 #if defined(OS_WIN) | 1392 #if defined(OS_WIN) |
1393 manager = new BrowserAccessibilityManagerWin( | 1393 manager = new BrowserAccessibilityManagerWin( |
1394 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); | 1394 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); |
| 1395 #elif defined (OS_ANDROID) |
| 1396 // TODO(mfomitchev): Accessibility on Android Aura: crbug.com/543262 |
1395 #else | 1397 #else |
1396 manager = BrowserAccessibilityManager::Create( | 1398 manager = BrowserAccessibilityManager::Create( |
1397 BrowserAccessibilityManager::GetEmptyDocument(), delegate); | 1399 BrowserAccessibilityManager::GetEmptyDocument(), delegate); |
1398 #endif | 1400 #endif |
1399 return manager; | 1401 return manager; |
1400 } | 1402 } |
1401 | 1403 |
1402 gfx::AcceleratedWidget | 1404 gfx::AcceleratedWidget |
1403 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { | 1405 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { |
1404 #if defined(OS_WIN) | 1406 #if defined(OS_WIN) |
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2940 | 2942 |
2941 //////////////////////////////////////////////////////////////////////////////// | 2943 //////////////////////////////////////////////////////////////////////////////// |
2942 // RenderWidgetHostViewBase, public: | 2944 // RenderWidgetHostViewBase, public: |
2943 | 2945 |
2944 // static | 2946 // static |
2945 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2947 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2946 GetScreenInfoForWindow(results, NULL); | 2948 GetScreenInfoForWindow(results, NULL); |
2947 } | 2949 } |
2948 | 2950 |
2949 } // namespace content | 2951 } // namespace content |
OLD | NEW |