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

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

Issue 10154013: Fixes crash in closing menus. There are two issues here: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixor Created 8 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 #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 #pragma once 7 #pragma once
8 8
9 #include <atlbase.h> 9 #include <atlbase.h>
10 #include <atlapp.h> 10 #include <atlapp.h>
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 WPARAM w_param, 513 WPARAM w_param,
514 LPARAM l_param); 514 LPARAM l_param);
515 515
516 // Stops ignoring SetWindowPos() requests (see below). 516 // Stops ignoring SetWindowPos() requests (see below).
517 void StopIgnoringPosChanges() { ignore_window_pos_changes_ = false; } 517 void StopIgnoringPosChanges() { ignore_window_pos_changes_ = false; }
518 518
519 void RestoreEnabledIfNecessary(); 519 void RestoreEnabledIfNecessary();
520 520
521 void SetInitialFocus(); 521 void SetInitialFocus();
522 522
523 // Notifies any owned windows that we're closing.
524 void NotifyOwnedWindowsParentClosing();
525
523 // Overridden from internal::InputMethodDelegate 526 // Overridden from internal::InputMethodDelegate
524 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE; 527 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
525 528
526 // A delegate implementation that handles events received here. 529 // A delegate implementation that handles events received here.
527 // See class documentation for Widget in widget.h for a note about ownership. 530 // See class documentation for Widget in widget.h for a note about ownership.
528 internal::NativeWidgetDelegate* delegate_; 531 internal::NativeWidgetDelegate* delegate_;
529 532
530 // The following factory is used for calls to close the NativeWidgetWin 533 // The following factory is used for calls to close the NativeWidgetWin
531 // instance. 534 // instance.
532 base::WeakPtrFactory<NativeWidgetWin> close_widget_factory_; 535 base::WeakPtrFactory<NativeWidgetWin> close_widget_factory_;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 bool has_non_client_view_; 654 bool has_non_client_view_;
652 655
653 bool remove_standard_frame_; 656 bool remove_standard_frame_;
654 657
655 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin); 658 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
656 }; 659 };
657 660
658 } // namespace views 661 } // namespace views
659 662
660 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 663 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698