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

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

Issue 1615073005: Revert of Makes sure the keyboard typing isn't blocked when InputMethod::OnFocus() is not correctly (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 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 LRESULT* l_result) override; 186 LRESULT* l_result) override;
187 void HandleMenuLoop(bool in_menu_loop) override; 187 void HandleMenuLoop(bool in_menu_loop) override;
188 bool PreHandleMSG(UINT message, 188 bool PreHandleMSG(UINT message,
189 WPARAM w_param, 189 WPARAM w_param,
190 LPARAM l_param, 190 LPARAM l_param,
191 LRESULT* result) override; 191 LRESULT* result) override;
192 void PostHandleMSG(UINT message, WPARAM w_param, LPARAM l_param) override; 192 void PostHandleMSG(UINT message, WPARAM w_param, LPARAM l_param) override;
193 bool HandleScrollEvent(const ui::ScrollEvent& event) override; 193 bool HandleScrollEvent(const ui::ScrollEvent& event) override;
194 void HandleWindowSizeChanging() override; 194 void HandleWindowSizeChanging() override;
195 void HandleWindowSizeChanged() override; 195 void HandleWindowSizeChanged() override;
196 void AddStringLog(const char* log_string) override;
197 void AddBooleanLog(bool bool_val) override;
198 196
199 Widget* GetWidget(); 197 Widget* GetWidget();
200 const Widget* GetWidget() const; 198 const Widget* GetWidget() const;
201 HWND GetHWND() const; 199 HWND GetHWND() const;
202 200
203 private: 201 private:
204 void SetWindowTransparency(); 202 void SetWindowTransparency();
205 203
206 // Returns true if a modal window is active in the current root window chain. 204 // Returns true if a modal window is active in the current root window chain.
207 bool IsModalWindowActive() const; 205 bool IsModalWindowActive() const;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 static bool is_cursor_visible_; 255 static bool is_cursor_visible_;
258 256
259 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; 257 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
260 258
261 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostWin); 259 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostWin);
262 }; 260 };
263 261
264 } // namespace views 262 } // namespace views
265 263
266 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ 264 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698