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

Unified Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.h

Issue 2581023002: Add tab status to accessibility labels (Closed)
Patch Set: Add tab index check. Fixes ChromeVox crash. Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
index 63f6bff9f5240be5a07f2efab5834f8f74e6b138..6b8ee00a9d5356ef624a47de73672eaf42b117e0 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
@@ -33,7 +33,9 @@ class ListSelectionModel;
class BrowserTabStripController : public TabStripController,
public TabStripModelObserver {
public:
- BrowserTabStripController(Browser* browser, TabStripModel* model);
+ BrowserTabStripController(Browser* browser,
+ TabStripModel* model,
+ BrowserView* browser_view);
sky 2017/01/03 23:11:41 BrowserView has a browser() function, so that now
edwardjung 2017/01/05 16:59:45 Done.
~BrowserTabStripController() override;
void InitFromModel(TabStrip* tabstrip);
@@ -76,6 +78,7 @@ class BrowserTabStripController : public TabStripController,
void OnStoppedDraggingTabs() override;
void CheckFileSupported(const GURL& url) override;
SkColor GetToolbarTopSeparatorColor() const override;
+ base::string16 GetAccessibleTabName(const Tab* tab) const override;
// TabStripModelObserver implementation:
void TabInsertedAt(TabStripModel* tab_strip_model,
@@ -101,6 +104,8 @@ class BrowserTabStripController : public TabStripController,
void TabBlockedStateChanged(content::WebContents* contents,
int model_index) override;
+ const Browser* browser() const { return browser_; }
+
protected:
// The context in which SetTabRendererDataFromModel is being called.
enum TabStatus {
@@ -118,8 +123,6 @@ class BrowserTabStripController : public TabStripController,
const TabStrip* tabstrip() const { return tabstrip_; }
- const Browser* browser() const { return browser_; }
-
private:
class TabContextMenuContents;
@@ -151,6 +154,8 @@ class BrowserTabStripController : public TabStripController,
// Non-owning pointer to the browser which is using this controller.
Browser* browser_;
+ BrowserView* browser_view_;
+
// If non-NULL it means we're showing a menu for the tab.
std::unique_ptr<TabContextMenuContents> context_menu_contents_;

Powered by Google App Engine
This is Rietveld 408576698