mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move thumbar_host_ from TreeHost to NativeWindow

Browse source
This commit is contained in:
Cheng Zhao 2015-08-06 10:25:50 +08:00
parent d175a68586
commit 39af10cc8d
4 changed files with 32 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_views.h
View file

@ -27,8 +27,10 @@ namespace atom {
class GlobalMenuBarX11;
class MenuBar;
class WindowStateWatcher;
#if defined(OS_WIN)
class AtomDesktopWindowTreeHostWin;
class ThumbarHost;
#endif
class NativeWindowViews : public NativeWindow,
@ -134,6 +136,12 @@ class NativeWindowViews : public NativeWindow,
std::string* name, std::string* class_name) override;
#endif
#if defined(OS_WIN)
// MessageHandlerDelegate:
bool PreHandleMSG(
UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
#endif
// NativeWindow:
void HandleKeyboardEvent(
content::WebContents*,
@ -171,6 +179,8 @@ class NativeWindowViews : public NativeWindow,
// Records window was whether restored from minimized state or maximized
// state.
bool is_minimized_;
// In charge of running thumbar related APIs.
scoped_ptr<ThumbarHost> thumbar_host_;
#endif
// Handles unhandled keyboard messages coming back from the renderer process.