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 b1baac40247d1d8a20ba8c50d5c13f476078c5bb..3d100cb64f9aca8a67692c134a1fdeed5a23bc8f 100644 |
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h |
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h |
@@ -97,17 +97,28 @@ class BrowserTabStripController : public TabStripController, |
const NotificationSource& source, |
const NotificationDetails& details) OVERRIDE; |
+ protected: |
+ // Sets the TabRendererData from the TabStripModel. |
+ virtual void SetTabRendererDataFromModel(TabContents* contents, |
sky
2011/06/16 15:43:41
Position of definition should match that of declar
Emmanuel Saint-loubert-Bié
2011/06/17 00:01:44
Done.
|
+ int model_index, |
+ TabRendererData* data, |
+ bool new_tab); |
sky
2011/06/16 15:43:41
Use an enum instead of a boolean.
Emmanuel Saint-loubert-Bié
2011/06/17 00:01:44
Done.
|
+ |
+ Profile* profile() const { return model_->profile(); } |
+ |
+ TabStripModel* model_; |
sky
2011/06/16 15:43:41
No protected members. Add protected accessors inst
Emmanuel Saint-loubert-Bié
2011/06/17 00:01:44
Done.
|
+ |
+ BaseTabStrip* tabstrip_; |
+ |
+ // Non-owning pointer to the browser which is using this controller. |
+ Browser* browser_; |
+ |
private: |
class TabContextMenuContents; |
// Invokes tabstrip_->SetTabData. |
void SetTabDataAt(TabContentsWrapper* contents, int model_index); |
- // Sets the TabRendererData from the TabStripModel. |
- void SetTabRendererDataFromModel(TabContents* contents, |
- int model_index, |
- TabRendererData* data); |
- |
void StartHighlightTabsForCommand( |
TabStripModel::ContextMenuCommand command_id, |
BaseTab* tab); |
@@ -115,15 +126,6 @@ class BrowserTabStripController : public TabStripController, |
TabStripModel::ContextMenuCommand command_id, |
BaseTab* tab); |
- Profile* profile() const { return model_->profile(); } |
- |
- TabStripModel* model_; |
- |
- BaseTabStrip* tabstrip_; |
- |
- // Non-owning pointer to the browser which is using this controller. |
- Browser* browser_; |
- |
// If non-NULL it means we're showing a menu for the tab. |
scoped_ptr<TabContextMenuContents> context_menu_contents_; |