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

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

Issue 173803002: Redesigns the text input focus handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added an unittest and thread checker. Created 6 years, 8 months 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 | Annotate | Revision Log
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 "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 CreateBrowserAccessibilityManagerIfNeeded(); 732 CreateBrowserAccessibilityManagerIfNeeded();
733 BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager(); 733 BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager();
734 if (manager) 734 if (manager)
735 return manager->GetRoot()->ToBrowserAccessibilityWin(); 735 return manager->GetRoot()->ToBrowserAccessibilityWin();
736 #endif 736 #endif
737 737
738 NOTIMPLEMENTED(); 738 NOTIMPLEMENTED();
739 return static_cast<gfx::NativeViewAccessible>(NULL); 739 return static_cast<gfx::NativeViewAccessible>(NULL);
740 } 740 }
741 741
742 ui::TextInputClient* RenderWidgetHostViewAura::GetTextInputClient() {
743 return this;
744 }
745
742 void RenderWidgetHostViewAura::SetKeyboardFocus() { 746 void RenderWidgetHostViewAura::SetKeyboardFocus() {
743 #if defined(OS_WIN) 747 #if defined(OS_WIN)
744 if (CanFocus()) { 748 if (CanFocus()) {
745 aura::WindowTreeHost* host = window_->GetHost(); 749 aura::WindowTreeHost* host = window_->GetHost();
746 if (host) 750 if (host)
747 ::SetFocus(host->GetAcceleratedWidget()); 751 ::SetFocus(host->GetAcceleratedWidget());
748 } 752 }
749 #endif 753 #endif
750 } 754 }
751 755
(...skipping 2467 matching lines...) Expand 10 before | Expand all | Expand 10 after
3219 RenderWidgetHost* widget) { 3223 RenderWidgetHost* widget) {
3220 return new RenderWidgetHostViewAura(widget); 3224 return new RenderWidgetHostViewAura(widget);
3221 } 3225 }
3222 3226
3223 // static 3227 // static
3224 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 3228 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
3225 GetScreenInfoForWindow(results, NULL); 3229 GetScreenInfoForWindow(results, NULL);
3226 } 3230 }
3227 3231
3228 } // namespace content 3232 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698