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

Side by Side Diff: ash/wm/panels/panel_frame_view.h

Issue 38073004: Not moving a docked window when restoring a previously maximized window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Not moving a docked window when restoring a previously maximized window (delegating IsDocked to non… Created 7 years, 1 month 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 ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 5 #ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/gfx/font.h" 10 #include "ui/gfx/font.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Overridden from views::NonClientFrameView: 45 // Overridden from views::NonClientFrameView:
46 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 46 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
47 virtual gfx::Rect GetWindowBoundsForClientBounds( 47 virtual gfx::Rect GetWindowBoundsForClientBounds(
48 const gfx::Rect& client_bounds) const OVERRIDE; 48 const gfx::Rect& client_bounds) const OVERRIDE;
49 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 49 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
50 virtual void GetWindowMask(const gfx::Size& size, 50 virtual void GetWindowMask(const gfx::Size& size,
51 gfx::Path* window_mask) OVERRIDE; 51 gfx::Path* window_mask) OVERRIDE;
52 virtual void ResetWindowControls() OVERRIDE; 52 virtual void ResetWindowControls() OVERRIDE;
53 virtual void UpdateWindowIcon() OVERRIDE; 53 virtual void UpdateWindowIcon() OVERRIDE;
54 virtual void UpdateWindowTitle() OVERRIDE; 54 virtual void UpdateWindowTitle() OVERRIDE;
55 virtual bool IsDocked() const OVERRIDE;
55 56
56 // Overridden from views::View: 57 // Overridden from views::View:
57 virtual gfx::Size GetMinimumSize() OVERRIDE; 58 virtual gfx::Size GetMinimumSize() OVERRIDE;
58 virtual void Layout() OVERRIDE; 59 virtual void Layout() OVERRIDE;
59 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 60 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
60 61
61 // Child View class describing the panel's title bar behavior 62 // Child View class describing the panel's title bar behavior
62 // and buttons, owned by the view hierarchy 63 // and buttons, owned by the view hierarchy
63 views::Widget* frame_; 64 views::Widget* frame_;
64 FrameCaptionButtonContainerView* caption_button_container_; 65 FrameCaptionButtonContainerView* caption_button_container_;
65 views::ImageView* window_icon_; 66 views::ImageView* window_icon_;
66 gfx::Rect client_view_bounds_; 67 gfx::Rect client_view_bounds_;
67 const gfx::Font title_font_; 68 const gfx::Font title_font_;
68 69
69 // Helper class for painting the header. 70 // Helper class for painting the header.
70 scoped_ptr<HeaderPainter> header_painter_; 71 scoped_ptr<HeaderPainter> header_painter_;
71 72
72 // Updates the hittest bounds overrides based on the window show type. 73 // Updates the hittest bounds overrides based on the window show type.
73 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 74 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
74 75
75 DISALLOW_COPY_AND_ASSIGN(PanelFrameView); 76 DISALLOW_COPY_AND_ASSIGN(PanelFrameView);
76 }; 77 };
77 78
78 } 79 }
79 80
80 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 81 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698