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

Side by Side Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

Issue 10827198: Change View::HitTest to View::HitTestRect (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
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_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ASH_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/search/search_types.h" 10 #include "chrome/browser/ui/search/search_types.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 47 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
48 virtual void GetWindowMask(const gfx::Size& size, 48 virtual void GetWindowMask(const gfx::Size& size,
49 gfx::Path* window_mask) OVERRIDE; 49 gfx::Path* window_mask) OVERRIDE;
50 virtual void ResetWindowControls() OVERRIDE; 50 virtual void ResetWindowControls() OVERRIDE;
51 virtual void UpdateWindowIcon() OVERRIDE; 51 virtual void UpdateWindowIcon() OVERRIDE;
52 52
53 // views::View overrides: 53 // views::View overrides:
54 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 54 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
55 virtual void Layout() OVERRIDE; 55 virtual void Layout() OVERRIDE;
56 virtual std::string GetClassName() const OVERRIDE; 56 virtual std::string GetClassName() const OVERRIDE;
57 virtual bool HitTest(const gfx::Point& l) const OVERRIDE; 57 virtual bool HitTest(const gfx::Rect& r) const OVERRIDE;
58 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 58 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
59 virtual gfx::Size GetMinimumSize() OVERRIDE; 59 virtual gfx::Size GetMinimumSize() OVERRIDE;
60 60
61 // views::ButtonListener overrides: 61 // views::ButtonListener overrides:
62 virtual void ButtonPressed(views::Button* sender, 62 virtual void ButtonPressed(views::Button* sender,
63 const views::Event& event) OVERRIDE; 63 const views::Event& event) OVERRIDE;
64 64
65 // Overridden from chrome::TabIconViewModel: 65 // Overridden from chrome::TabIconViewModel:
66 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; 66 virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
67 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; 67 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 scoped_ptr<ash::FramePainter> frame_painter_; 108 scoped_ptr<ash::FramePainter> frame_painter_;
109 109
110 // If true the |size_button_| minimizes, otherwise it toggles between 110 // If true the |size_button_| minimizes, otherwise it toggles between
111 // maximized and restored. 111 // maximized and restored.
112 bool size_button_minimizes_; 112 bool size_button_minimizes_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 114 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
115 }; 115 };
116 116
117 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 117 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698