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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc

Issue 1566083002: Makes sure the keyboard typing isn't blocked when InputMethod::OnFocus() is not correctly called. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
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 "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
6 6
7 #include "base/win/metro.h" 7 #include "base/win/metro.h"
8 #include "third_party/skia/include/core/SkPath.h" 8 #include "third_party/skia/include/core/SkPath.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after
907 void DesktopWindowTreeHostWin::HandleWindowSizeChanged() { 907 void DesktopWindowTreeHostWin::HandleWindowSizeChanged() {
908 // A resize may not have occurred if the window size happened not to have 908 // A resize may not have occurred if the window size happened not to have
909 // changed (can occur on Windows 10 when snapping a window to the side of 909 // changed (can occur on Windows 10 when snapping a window to the side of
910 // the screen). In that case do a resize to the current size to reenable 910 // the screen). In that case do a resize to the current size to reenable
911 // swaps. 911 // swaps.
912 if (compositor()) 912 if (compositor())
913 compositor()->SetScaleAndSize(compositor()->device_scale_factor(), 913 compositor()->SetScaleAndSize(compositor()->device_scale_factor(),
914 compositor()->size()); 914 compositor()->size());
915 } 915 }
916 916
917 void DesktopWindowTreeHostWin::AddStringLog(const char* log_string) {
918 GetInputMethod()->GetLogCollector()->AddString(log_string);
919 }
920
921 void DesktopWindowTreeHostWin::AddBooleanLog(bool bool_val) {
922 GetInputMethod()->GetLogCollector()->AddBoolean(bool_val);
923 }
924
925 void DesktopWindowTreeHostWin::AddNumberLog(int num_val) {
926 GetInputMethod()->GetLogCollector()->AddNumber(num_val);
927 }
928
917 //////////////////////////////////////////////////////////////////////////////// 929 ////////////////////////////////////////////////////////////////////////////////
918 // DesktopWindowTreeHostWin, private: 930 // DesktopWindowTreeHostWin, private:
919 931
920 Widget* DesktopWindowTreeHostWin::GetWidget() { 932 Widget* DesktopWindowTreeHostWin::GetWidget() {
921 return native_widget_delegate_->AsWidget(); 933 return native_widget_delegate_->AsWidget();
922 } 934 }
923 935
924 const Widget* DesktopWindowTreeHostWin::GetWidget() const { 936 const Widget* DesktopWindowTreeHostWin::GetWidget() const {
925 return native_widget_delegate_->AsWidget(); 937 return native_widget_delegate_->AsWidget();
926 } 938 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 970
959 // static 971 // static
960 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 972 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
961 internal::NativeWidgetDelegate* native_widget_delegate, 973 internal::NativeWidgetDelegate* native_widget_delegate,
962 DesktopNativeWidgetAura* desktop_native_widget_aura) { 974 DesktopNativeWidgetAura* desktop_native_widget_aura) {
963 return new DesktopWindowTreeHostWin(native_widget_delegate, 975 return new DesktopWindowTreeHostWin(native_widget_delegate,
964 desktop_native_widget_aura); 976 desktop_native_widget_aura);
965 } 977 }
966 978
967 } // namespace views 979 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698