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

Side by Side Diff: ui/views/widget/native_widget_win.h

Issue 10828398: Revert 152388 - Revert 152374 - Move more message handlers from NativeWidgetWin to HWNDMessageHandl… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ui/views/widget/hwnd_message_handler_delegate.h ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_NATIVE_WIDGET_WIN_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 typedef ScopedVector<ui::ViewProp> ViewProps; 487 typedef ScopedVector<ui::ViewProp> ViewProps;
488 typedef std::set<DWORD> TouchIDs; 488 typedef std::set<DWORD> TouchIDs;
489 489
490 // TODO(beng): This friendship can be removed once all methods relating to 490 // TODO(beng): This friendship can be removed once all methods relating to
491 // this object being a WindowImpl are moved to HWNDMessageHandler. 491 // this object being a WindowImpl are moved to HWNDMessageHandler.
492 friend HWNDMessageHandler; 492 friend HWNDMessageHandler;
493 493
494 // Overridden from HWNDMessageHandlerDelegate: 494 // Overridden from HWNDMessageHandlerDelegate:
495 virtual bool IsWidgetWindow() const OVERRIDE; 495 virtual bool IsWidgetWindow() const OVERRIDE;
496 virtual bool IsUsingCustomFrame() const OVERRIDE; 496 virtual bool IsUsingCustomFrame() const OVERRIDE;
497 virtual bool CanResize() const OVERRIDE;
498 virtual bool CanMaximize() const OVERRIDE;
499 virtual bool CanActivate() const OVERRIDE;
500 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
501 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* path) OVERRIDE;
497 virtual InputMethod* GetInputMethod() OVERRIDE; 502 virtual InputMethod* GetInputMethod() OVERRIDE;
498 virtual void HandleAppDeactivated() OVERRIDE; 503 virtual void HandleAppDeactivated() OVERRIDE;
499 virtual bool HandleAppCommand(short command) OVERRIDE; 504 virtual bool HandleAppCommand(short command) OVERRIDE;
500 virtual void HandleCaptureLost() OVERRIDE; 505 virtual void HandleCaptureLost() OVERRIDE;
501 virtual void HandleClose() OVERRIDE; 506 virtual void HandleClose() OVERRIDE;
502 virtual bool HandleCommand(int command) OVERRIDE; 507 virtual bool HandleCommand(int command) OVERRIDE;
503 virtual void HandleDestroy() OVERRIDE; 508 virtual void HandleDestroy() OVERRIDE;
504 virtual void HandleDisplayChange() OVERRIDE; 509 virtual void HandleDisplayChange() OVERRIDE;
505 virtual void HandleGlassModeChange() OVERRIDE; 510 virtual void HandleGlassModeChange() OVERRIDE;
506 virtual void HandleBeginWMSizeMove() OVERRIDE; 511 virtual void HandleBeginWMSizeMove() OVERRIDE;
507 virtual void HandleEndWMSizeMove() OVERRIDE; 512 virtual void HandleEndWMSizeMove() OVERRIDE;
508 virtual void HandleMove() OVERRIDE; 513 virtual void HandleMove() OVERRIDE;
514 virtual void HandleNativeFocus(HWND last_focused_window) OVERRIDE;
515 virtual void HandleNativeBlur(HWND focused_window) OVERRIDE;
509 virtual NativeWidgetWin* AsNativeWidgetWin() OVERRIDE; 516 virtual NativeWidgetWin* AsNativeWidgetWin() OVERRIDE;
510 517
511 // Called after the WM_ACTIVATE message has been processed by the default 518 // Called after the WM_ACTIVATE message has been processed by the default
512 // windows procedure. 519 // windows procedure.
513 static void PostProcessActivateMessage(NativeWidgetWin* widget, 520 static void PostProcessActivateMessage(NativeWidgetWin* widget,
514 int activation_state); 521 int activation_state);
515 522
516 void SetInitParams(const Widget::InitParams& params); 523 void SetInitParams(const Widget::InitParams& params);
517 524
518 // Synchronously paints the invalid contents of the Widget. 525 // Synchronously paints the invalid contents of the Widget.
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 TouchIDs touch_ids_; 708 TouchIDs touch_ids_;
702 709
703 scoped_ptr<HWNDMessageHandler> message_handler_; 710 scoped_ptr<HWNDMessageHandler> message_handler_;
704 711
705 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin); 712 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
706 }; 713 };
707 714
708 } // namespace views 715 } // namespace views
709 716
710 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 717 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
OLDNEW
« no previous file with comments | « ui/views/widget/hwnd_message_handler_delegate.h ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698