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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_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
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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // views::NonClientFrameView overrides: 42 // views::NonClientFrameView overrides:
43 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 43 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
44 virtual gfx::Rect GetWindowBoundsForClientBounds( 44 virtual gfx::Rect GetWindowBoundsForClientBounds(
45 const gfx::Rect& client_bounds) const OVERRIDE; 45 const gfx::Rect& client_bounds) const OVERRIDE;
46 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 46 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
47 virtual void GetWindowMask(const gfx::Size& size, 47 virtual void GetWindowMask(const gfx::Size& size,
48 gfx::Path* window_mask) OVERRIDE; 48 gfx::Path* window_mask) OVERRIDE;
49 virtual void ResetWindowControls() OVERRIDE; 49 virtual void ResetWindowControls() OVERRIDE;
50 virtual void UpdateWindowIcon() OVERRIDE; 50 virtual void UpdateWindowIcon() OVERRIDE;
51 virtual void UpdateWindowTitle() OVERRIDE; 51 virtual void UpdateWindowTitle() OVERRIDE;
52 virtual bool IsDocked() const OVERRIDE;
52 53
53 // views::View overrides: 54 // views::View overrides:
54 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 55 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
55 virtual void Layout() OVERRIDE; 56 virtual void Layout() OVERRIDE;
56 virtual const char* GetClassName() const OVERRIDE; 57 virtual const char* GetClassName() const OVERRIDE;
57 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; 58 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
58 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 59 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
59 virtual gfx::Size GetMinimumSize() OVERRIDE; 60 virtual gfx::Size GetMinimumSize() OVERRIDE;
60 virtual void OnThemeChanged() OVERRIDE; 61 virtual void OnThemeChanged() OVERRIDE;
61 62
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 scoped_ptr<ash::HeaderPainter> header_painter_; 118 scoped_ptr<ash::HeaderPainter> header_painter_;
118 119
119 // Updates the hittest bounds overrides based on the window show type. 120 // Updates the hittest bounds overrides based on the window show type.
120 scoped_ptr<ash::FrameBorderHitTestController> 121 scoped_ptr<ash::FrameBorderHitTestController>
121 frame_border_hit_test_controller_; 122 frame_border_hit_test_controller_;
122 123
123 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 124 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
124 }; 125 };
125 126
126 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 127 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698