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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

Issue 298653007: Revert of Remove override of View::HitTestRect() from BookmarkBarView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | chrome/browser/ui/views/bookmarks/bookmark_bar_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_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 Profile* profile); 159 Profile* profile);
160 160
161 // DetachableToolbarView methods: 161 // DetachableToolbarView methods:
162 virtual bool IsDetached() const OVERRIDE; 162 virtual bool IsDetached() const OVERRIDE;
163 virtual double GetAnimationValue() const OVERRIDE; 163 virtual double GetAnimationValue() const OVERRIDE;
164 virtual int GetToolbarOverlap() const OVERRIDE; 164 virtual int GetToolbarOverlap() const OVERRIDE;
165 165
166 // View methods: 166 // View methods:
167 virtual gfx::Size GetPreferredSize() const OVERRIDE; 167 virtual gfx::Size GetPreferredSize() const OVERRIDE;
168 virtual gfx::Size GetMinimumSize() const OVERRIDE; 168 virtual gfx::Size GetMinimumSize() const OVERRIDE;
169 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
169 virtual void Layout() OVERRIDE; 170 virtual void Layout() OVERRIDE;
170 virtual void ViewHierarchyChanged( 171 virtual void ViewHierarchyChanged(
171 const ViewHierarchyChangedDetails& details) OVERRIDE; 172 const ViewHierarchyChangedDetails& details) OVERRIDE;
172 virtual void PaintChildren(gfx::Canvas* canvas, 173 virtual void PaintChildren(gfx::Canvas* canvas,
173 const views::CullSet& cull_set) OVERRIDE; 174 const views::CullSet& cull_set) OVERRIDE;
174 virtual bool GetDropFormats( 175 virtual bool GetDropFormats(
175 int* formats, 176 int* formats,
176 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 177 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
177 virtual bool AreDropTypesRequired() OVERRIDE; 178 virtual bool AreDropTypesRequired() OVERRIDE;
178 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; 179 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
179 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 180 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
180 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 181 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
181 virtual void OnDragExited() OVERRIDE; 182 virtual void OnDragExited() OVERRIDE;
182 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 183 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
183 virtual void OnThemeChanged() OVERRIDE; 184 virtual void OnThemeChanged() OVERRIDE;
184 virtual const char* GetClassName() const OVERRIDE; 185 virtual const char* GetClassName() const OVERRIDE;
185 186
186 // ui::EventTarget:
187 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
188
189 // AccessiblePaneView: 187 // AccessiblePaneView:
190 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 188 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
191 189
192 // gfx::AnimationDelegate: 190 // gfx::AnimationDelegate:
193 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 191 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
194 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 192 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
195 193
196 // BookmarkMenuControllerObserver: 194 // BookmarkMenuControllerObserver:
197 virtual void BookmarkMenuControllerDeleted( 195 virtual void BookmarkMenuControllerDeleted(
198 BookmarkMenuController* controller) OVERRIDE; 196 BookmarkMenuController* controller) OVERRIDE;
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 435
438 BookmarkBar::State bookmark_bar_state_; 436 BookmarkBar::State bookmark_bar_state_;
439 437
440 // Are we animating to or from the detached state? 438 // Are we animating to or from the detached state?
441 bool animating_detached_; 439 bool animating_detached_;
442 440
443 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); 441 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
444 }; 442 };
445 443
446 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ 444 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698