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

Side by Side Diff: chrome/browser/views/browser_actions_container.h

Issue 1616004: Fix Regression for Accessible Names (Closed)
Patch Set: Created 10 years, 8 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 BrowserActionButton* button() { return button_; } 147 BrowserActionButton* button() { return button_; }
148 148
149 // Allocates a canvas object on the heap and draws into it the icon for the 149 // Allocates a canvas object on the heap and draws into it the icon for the
150 // view as well as the badge (if any). Caller is responsible for deleting the 150 // view as well as the badge (if any). Caller is responsible for deleting the
151 // returned object. 151 // returned object.
152 gfx::Canvas* GetIconWithBadge(); 152 gfx::Canvas* GetIconWithBadge();
153 153
154 // Accessibility accessors, overridden from View. 154 // Accessibility accessors, overridden from View.
155 virtual bool GetAccessibleRole(AccessibilityTypes::Role* role); 155 virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
156 virtual bool GetAccessibleName(std::wstring* name);
157 156
158 private: 157 private:
159 virtual void Layout(); 158 virtual void Layout();
160 159
161 // Override PaintChildren so that we can paint the badge on top of children. 160 // Override PaintChildren so that we can paint the badge on top of children.
162 virtual void PaintChildren(gfx::Canvas* canvas); 161 virtual void PaintChildren(gfx::Canvas* canvas);
163 162
164 // The container for this view. 163 // The container for this view.
165 BrowserActionsContainer* panel_; 164 BrowserActionsContainer* panel_;
166 165
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 views::View* child); 315 views::View* child);
317 virtual bool GetDropFormats( 316 virtual bool GetDropFormats(
318 int* formats, std::set<OSExchangeData::CustomFormat>* custom_formats); 317 int* formats, std::set<OSExchangeData::CustomFormat>* custom_formats);
319 virtual bool AreDropTypesRequired(); 318 virtual bool AreDropTypesRequired();
320 virtual bool CanDrop(const OSExchangeData& data); 319 virtual bool CanDrop(const OSExchangeData& data);
321 virtual void OnDragEntered(const views::DropTargetEvent& event); 320 virtual void OnDragEntered(const views::DropTargetEvent& event);
322 virtual int OnDragUpdated(const views::DropTargetEvent& event); 321 virtual int OnDragUpdated(const views::DropTargetEvent& event);
323 virtual void OnDragExited(); 322 virtual void OnDragExited();
324 virtual int OnPerformDrop(const views::DropTargetEvent& event); 323 virtual int OnPerformDrop(const views::DropTargetEvent& event);
325 virtual bool GetAccessibleRole(AccessibilityTypes::Role* role); 324 virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
326 virtual bool GetAccessibleName(std::wstring* name);
327 325
328 // Overridden from views::ViewMenuDelegate: 326 // Overridden from views::ViewMenuDelegate:
329 virtual void RunMenu(View* source, const gfx::Point& pt); 327 virtual void RunMenu(View* source, const gfx::Point& pt);
330 328
331 // Overridden from views::DragController: 329 // Overridden from views::DragController:
332 virtual void WriteDragData(View* sender, 330 virtual void WriteDragData(View* sender,
333 const gfx::Point& press_pt, 331 const gfx::Point& press_pt,
334 OSExchangeData* data); 332 OSExchangeData* data);
335 virtual int GetDragOperations(View* sender, const gfx::Point& p); 333 virtual int GetDragOperations(View* sender, const gfx::Point& p);
336 virtual bool CanStartDrag(View* sender, 334 virtual bool CanStartDrag(View* sender,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 490
493 ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_; 491 ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
494 492
495 // Handles delayed showing of the overflow menu when hovering. 493 // Handles delayed showing of the overflow menu when hovering.
496 ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_; 494 ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;
497 495
498 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 496 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
499 }; 497 };
500 498
501 #endif // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 499 #endif // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/browser_actions_container.cc » ('j') | chrome/browser/views/tabs/tab_renderer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698