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

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: 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
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 53
54 // views::View overrides: 54 // views::View overrides:
55 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 55 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
56 virtual void Layout() OVERRIDE; 56 virtual void Layout() OVERRIDE;
57 virtual std::string GetClassName() const OVERRIDE; 57 virtual std::string GetClassName() const OVERRIDE;
58 virtual bool HitTest(const gfx::Point& l) const OVERRIDE; 58 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
59 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 59 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
60 virtual gfx::Size GetMinimumSize() OVERRIDE; 60 virtual gfx::Size GetMinimumSize() OVERRIDE;
61 61
62 // views::ButtonListener overrides: 62 // views::ButtonListener overrides:
63 virtual void ButtonPressed(views::Button* sender, 63 virtual void ButtonPressed(views::Button* sender,
64 const views::Event& event) OVERRIDE; 64 const views::Event& event) OVERRIDE;
65 65
66 // Overridden from chrome::TabIconViewModel: 66 // Overridden from chrome::TabIconViewModel:
67 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; 67 virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
68 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; 68 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 scoped_ptr<ash::FramePainter> frame_painter_; 109 scoped_ptr<ash::FramePainter> frame_painter_;
110 110
111 // If true the |size_button_| minimizes, otherwise it toggles between 111 // If true the |size_button_| minimizes, otherwise it toggles between
112 // maximized and restored. 112 // maximized and restored.
113 bool size_button_minimizes_; 113 bool size_button_minimizes_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 115 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
116 }; 116 };
117 117
118 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 118 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698