Chromium Code Reviews

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

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1394 matching lines...)
1405 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 1405 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
1406 } 1406 }
1407 1407
1408 BrowserAccessibilityManager* 1408 BrowserAccessibilityManager*
1409 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( 1409 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
1410 BrowserAccessibilityDelegate* delegate) { 1410 BrowserAccessibilityDelegate* delegate) {
1411 BrowserAccessibilityManager* manager = NULL; 1411 BrowserAccessibilityManager* manager = NULL;
1412 #if defined(OS_WIN) 1412 #if defined(OS_WIN)
1413 manager = new BrowserAccessibilityManagerWin( 1413 manager = new BrowserAccessibilityManagerWin(
1414 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); 1414 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
1415 #elif !defined(OS_ANDROID) 1415 #else
1416 manager = BrowserAccessibilityManager::Create( 1416 manager = BrowserAccessibilityManager::Create(
1417 BrowserAccessibilityManager::GetEmptyDocument(), delegate); 1417 BrowserAccessibilityManager::GetEmptyDocument(), delegate);
1418 #endif 1418 #endif
1419 return manager; 1419 return manager;
1420 } 1420 }
1421 1421
1422 gfx::AcceleratedWidget 1422 gfx::AcceleratedWidget
1423 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() { 1423 RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() {
1424 #if defined(OS_WIN) 1424 #if defined(OS_WIN)
1425 if (legacy_render_widget_host_HWND_) 1425 if (legacy_render_widget_host_HWND_)
(...skipping 1652 matching lines...)
3078 3078
3079 //////////////////////////////////////////////////////////////////////////////// 3079 ////////////////////////////////////////////////////////////////////////////////
3080 // RenderWidgetHostViewBase, public: 3080 // RenderWidgetHostViewBase, public:
3081 3081
3082 // static 3082 // static
3083 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 3083 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
3084 GetScreenInfoForWindow(results, NULL); 3084 GetScreenInfoForWindow(results, NULL);
3085 } 3085 }
3086 3086
3087 } // namespace content 3087 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/wake_lock/wake_lock_service_context.cc » ('j') | no next file with comments »

Powered by Google App Engine