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

Side by Side Diff: chrome/browser/ui/views/toolbar_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 | « chrome/browser/ui/views/tabs/tab_unittest.cc ('k') | chrome/browser/ui/views/toolbar_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 CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 const content::NotificationSource& source, 139 const content::NotificationSource& source,
140 const content::NotificationDetails& details) OVERRIDE; 140 const content::NotificationDetails& details) OVERRIDE;
141 141
142 // Overridden from ui::AcceleratorProvider: 142 // Overridden from ui::AcceleratorProvider:
143 virtual bool GetAcceleratorForCommandId( 143 virtual bool GetAcceleratorForCommandId(
144 int command_id, ui::Accelerator* accelerator) OVERRIDE; 144 int command_id, ui::Accelerator* accelerator) OVERRIDE;
145 145
146 // Overridden from views::View: 146 // Overridden from views::View:
147 virtual gfx::Size GetPreferredSize() OVERRIDE; 147 virtual gfx::Size GetPreferredSize() OVERRIDE;
148 virtual void Layout() OVERRIDE; 148 virtual void Layout() OVERRIDE;
149 virtual bool HitTest(const gfx::Point& l) const OVERRIDE; 149 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
150 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 150 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
151 virtual bool GetDropFormats( 151 virtual bool GetDropFormats(
152 int* formats, 152 int* formats,
153 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 153 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
154 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; 154 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
155 virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE; 155 virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
156 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE; 156 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
157 virtual void OnThemeChanged() OVERRIDE; 157 virtual void OnThemeChanged() OVERRIDE;
158 virtual std::string GetClassName() const OVERRIDE; 158 virtual std::string GetClassName() const OVERRIDE;
159 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; 159 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 242
243 // A list of listeners to call when the menu opens. 243 // A list of listeners to call when the menu opens.
244 ObserverList<views::MenuListener> menu_listeners_; 244 ObserverList<views::MenuListener> menu_listeners_;
245 245
246 content::NotificationRegistrar registrar_; 246 content::NotificationRegistrar registrar_;
247 247
248 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 248 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
249 }; 249 };
250 250
251 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 251 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_unittest.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698