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

Side by Side Diff: ash/frame/custom_frame_view_ash.h

Issue 380813003: Remove remaining overrides of View::HitTestRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase against ToT Created 6 years, 5 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
« no previous file with comments | « no previous file | ash/frame/custom_frame_view_ash.cc » ('j') | ui/views/window/non_client_view.cc » ('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_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_FRAME_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 23 matching lines...) Expand all
34 explicit CustomFrameViewAsh(views::Widget* frame); 34 explicit CustomFrameViewAsh(views::Widget* frame);
35 virtual ~CustomFrameViewAsh(); 35 virtual ~CustomFrameViewAsh();
36 36
37 // Inits |immersive_fullscreen_controller| so that the controller reveals 37 // Inits |immersive_fullscreen_controller| so that the controller reveals
38 // and hides |header_view_| in immersive fullscreen. 38 // and hides |header_view_| in immersive fullscreen.
39 // CustomFrameViewAsh does not take ownership of 39 // CustomFrameViewAsh does not take ownership of
40 // |immersive_fullscreen_controller|. 40 // |immersive_fullscreen_controller|.
41 void InitImmersiveFullscreenControllerForView( 41 void InitImmersiveFullscreenControllerForView(
42 ImmersiveFullscreenController* immersive_fullscreen_controller); 42 ImmersiveFullscreenController* immersive_fullscreen_controller);
43 43
44 // views::NonClientFrameView overrides: 44 // views::NonClientFrameView:
45 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 45 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
46 virtual gfx::Rect GetWindowBoundsForClientBounds( 46 virtual gfx::Rect GetWindowBoundsForClientBounds(
47 const gfx::Rect& client_bounds) const OVERRIDE; 47 const gfx::Rect& client_bounds) const OVERRIDE;
48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
49 virtual void GetWindowMask(const gfx::Size& size, 49 virtual void GetWindowMask(const gfx::Size& size,
50 gfx::Path* window_mask) OVERRIDE; 50 gfx::Path* window_mask) OVERRIDE;
51 virtual void ResetWindowControls() OVERRIDE; 51 virtual void ResetWindowControls() OVERRIDE;
52 virtual void UpdateWindowIcon() OVERRIDE; 52 virtual void UpdateWindowIcon() OVERRIDE;
53 virtual void UpdateWindowTitle() OVERRIDE; 53 virtual void UpdateWindowTitle() OVERRIDE;
54 virtual bool DoesIntersectRect(const views::View* target,
55 const gfx::Rect& rect) const OVERRIDE;
54 56
55 // views::View overrides: 57 // views::View:
56 virtual gfx::Size GetPreferredSize() const OVERRIDE; 58 virtual gfx::Size GetPreferredSize() const OVERRIDE;
57 virtual const char* GetClassName() const OVERRIDE; 59 virtual const char* GetClassName() const OVERRIDE;
58 virtual gfx::Size GetMinimumSize() const OVERRIDE; 60 virtual gfx::Size GetMinimumSize() const OVERRIDE;
59 virtual gfx::Size GetMaximumSize() const OVERRIDE; 61 virtual gfx::Size GetMaximumSize() const OVERRIDE;
60 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; 62 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE;
61 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
62 virtual void VisibilityChanged(views::View* starting_from, 63 virtual void VisibilityChanged(views::View* starting_from,
63 bool is_visible) OVERRIDE; 64 bool is_visible) OVERRIDE;
64 65
65 // Get the view of the header. 66 // Get the view of the header.
66 views::View* GetHeaderView(); 67 views::View* GetHeaderView();
67 68
68 const views::View* GetAvatarIconViewForTest() const; 69 const views::View* GetAvatarIconViewForTest() const;
69 70
70 private: 71 private:
71 class OverlayView; 72 class OverlayView;
(...skipping 15 matching lines...) Expand all
87 88
88 // Updates the hittest bounds overrides based on the window state type. 89 // Updates the hittest bounds overrides based on the window state type.
89 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 90 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
90 91
91 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 92 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
92 }; 93 };
93 94
94 } // namespace ash 95 } // namespace ash
95 96
96 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 97 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « no previous file | ash/frame/custom_frame_view_ash.cc » ('j') | ui/views/window/non_client_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698