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

Side by Side Diff: ui/views/window/non_client_view.h

Issue 10827198: Change View::HitTest to View::HitTestRect (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed errors reported by trybots 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
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/window/non_client_view.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_WINDOW_NON_CLIENT_VIEW_H_ 5 #ifndef UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
6 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ 6 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
7 7
8 #include "ui/views/view.h" 8 #include "ui/views/view.h"
9 #include "ui/views/window/client_view.h" 9 #include "ui/views/window/client_view.h"
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // the parent NonClientView because that makes it more difficult to calculate 60 // the parent NonClientView because that makes it more difficult to calculate
61 // hittests for regions that are partially obscured by the ClientView, e.g. 61 // hittests for regions that are partially obscured by the ClientView, e.g.
62 // HTSYSMENU. 62 // HTSYSMENU.
63 virtual int NonClientHitTest(const gfx::Point& point) = 0; 63 virtual int NonClientHitTest(const gfx::Point& point) = 0;
64 virtual void GetWindowMask(const gfx::Size& size, 64 virtual void GetWindowMask(const gfx::Size& size,
65 gfx::Path* window_mask) = 0; 65 gfx::Path* window_mask) = 0;
66 virtual void ResetWindowControls() = 0; 66 virtual void ResetWindowControls() = 0;
67 virtual void UpdateWindowIcon() = 0; 67 virtual void UpdateWindowIcon() = 0;
68 68
69 // Overridden from View: 69 // Overridden from View:
70 virtual bool HitTest(const gfx::Point& l) const OVERRIDE; 70 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
71 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 71 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
72 virtual std::string GetClassName() const OVERRIDE; 72 virtual std::string GetClassName() const OVERRIDE;
73 73
74 protected: 74 protected:
75 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 75 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
76 76
77 NonClientFrameView() : paint_as_active_(false) {} 77 NonClientFrameView() : paint_as_active_(false) {}
78 78
79 // Used to determine if the frame should be painted as active. Keyed off the 79 // Used to determine if the frame should be painted as active. Keyed off the
80 // window's actual active state and the override, see 80 // window's actual active state and the override, see
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 // The accessible name of this view. 227 // The accessible name of this view.
228 string16 accessible_name_; 228 string16 accessible_name_;
229 229
230 DISALLOW_COPY_AND_ASSIGN(NonClientView); 230 DISALLOW_COPY_AND_ASSIGN(NonClientView);
231 }; 231 };
232 232
233 } // namespace views 233 } // namespace views
234 234
235 #endif // UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ 235 #endif // UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/window/non_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698