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

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

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Addressing some feedback. Fixes for content/child and content/public/browser targets. Created 5 years, 1 month 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
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_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 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 1368 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
1369 } 1369 }
1370 1370
1371 BrowserAccessibilityManager* 1371 BrowserAccessibilityManager*
1372 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( 1372 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
1373 BrowserAccessibilityDelegate* delegate) { 1373 BrowserAccessibilityDelegate* delegate) {
1374 BrowserAccessibilityManager* manager = NULL; 1374 BrowserAccessibilityManager* manager = NULL;
1375 #if defined(OS_WIN) 1375 #if defined(OS_WIN)
1376 manager = new BrowserAccessibilityManagerWin( 1376 manager = new BrowserAccessibilityManagerWin(
1377 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); 1377 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
1378 #elif defined (OS_ANDROID)
1379 // TODO(mfomitchev): Accessibility on Android Aura: crbug.com/543262
1378 #else 1380 #else
1379 manager = BrowserAccessibilityManager::Create( 1381 manager = BrowserAccessibilityManager::Create(
1380 BrowserAccessibilityManager::GetEmptyDocument(), delegate); 1382 BrowserAccessibilityManager::GetEmptyDocument(), delegate);
1381 #endif 1383 #endif
1382 return manager; 1384 return manager;
1383 } 1385 }
1384 1386
1385 gfx::AcceleratedWidget 1387 gfx::AcceleratedWidget
1386 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { 1388 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() {
1387 #if defined(OS_WIN) 1389 #if defined(OS_WIN)
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
2899 2901
2900 //////////////////////////////////////////////////////////////////////////////// 2902 ////////////////////////////////////////////////////////////////////////////////
2901 // RenderWidgetHostViewBase, public: 2903 // RenderWidgetHostViewBase, public:
2902 2904
2903 // static 2905 // static
2904 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2906 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2905 GetScreenInfoForWindow(results, NULL); 2907 GetScreenInfoForWindow(results, NULL);
2906 } 2908 }
2907 2909
2908 } // namespace content 2910 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698