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

Side by Side Diff: ash/wm/custom_frame_view_ash.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
« no previous file with comments | « no previous file | ash/wm/custom_frame_view_ash.cc » ('j') | ui/views/widget/widget.h » ('J')
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 ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 26 matching lines...) Expand all
37 // views::NonClientFrameView overrides: 37 // views::NonClientFrameView overrides:
38 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 38 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
39 virtual gfx::Rect GetWindowBoundsForClientBounds( 39 virtual gfx::Rect GetWindowBoundsForClientBounds(
40 const gfx::Rect& client_bounds) const OVERRIDE; 40 const gfx::Rect& client_bounds) const OVERRIDE;
41 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 41 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
42 virtual void GetWindowMask(const gfx::Size& size, 42 virtual void GetWindowMask(const gfx::Size& size,
43 gfx::Path* window_mask) OVERRIDE; 43 gfx::Path* window_mask) OVERRIDE;
44 virtual void ResetWindowControls() OVERRIDE; 44 virtual void ResetWindowControls() OVERRIDE;
45 virtual void UpdateWindowIcon() OVERRIDE; 45 virtual void UpdateWindowIcon() OVERRIDE;
46 virtual void UpdateWindowTitle() OVERRIDE; 46 virtual void UpdateWindowTitle() OVERRIDE;
47 virtual bool IsDocked() const OVERRIDE;
47 48
48 // views::View overrides: 49 // views::View overrides:
49 virtual gfx::Size GetPreferredSize() OVERRIDE; 50 virtual gfx::Size GetPreferredSize() OVERRIDE;
50 virtual void Layout() OVERRIDE; 51 virtual void Layout() OVERRIDE;
51 virtual const char* GetClassName() const OVERRIDE; 52 virtual const char* GetClassName() const OVERRIDE;
52 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 53 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
53 virtual gfx::Size GetMinimumSize() OVERRIDE; 54 virtual gfx::Size GetMinimumSize() OVERRIDE;
54 virtual gfx::Size GetMaximumSize() OVERRIDE; 55 virtual gfx::Size GetMaximumSize() OVERRIDE;
55 56
56 private: 57 private:
(...skipping 11 matching lines...) Expand all
68 69
69 // Updates the hittest bounds overrides based on the window show type. 70 // Updates the hittest bounds overrides based on the window show type.
70 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 71 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
71 72
72 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 73 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
73 }; 74 };
74 75
75 } // namespace ash 76 } // namespace ash
76 77
77 #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 78 #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/custom_frame_view_ash.cc » ('j') | ui/views/widget/widget.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698