diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:00:45 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:00:45 +0000 |
| commit | e191c147e4704d4e75f548cdaf90f914d196aa63 (patch) | |
| tree | 566187bf422d3cf5ed8a66a4d7cb6fd05596e02e /chrome/browser/cocoa/tab_contents_controller.h | |
| parent | 60f7ba59cf2b26b9c8d19abfae3ca9fb6cc36cc1 (diff) | |
| download | chromium_src-e191c147e4704d4e75f548cdaf90f914d196aa63.zip chromium_src-e191c147e4704d4e75f548cdaf90f914d196aa63.tar.gz chromium_src-e191c147e4704d4e75f548cdaf90f914d196aa63.tar.bz2 | |
Change url bar text according to the model when updating the toolbar. Fix vtable issue in ToolbarModel by using correct declaration.
Review URL: http://codereview.chromium.org/27163
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_contents_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/tab_contents_controller.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/tab_contents_controller.h b/chrome/browser/cocoa/tab_contents_controller.h index 9f2eddd..99d5a8a 100644 --- a/chrome/browser/cocoa/tab_contents_controller.h +++ b/chrome/browser/cocoa/tab_contents_controller.h @@ -13,6 +13,7 @@ class LocationBar; class TabContents; class TabContentsCommandObserver; class TabStripModel; +class ToolbarModel; // A class that controls the contents of a tab, including the toolbar and // web area. @@ -31,6 +32,7 @@ class TabStripModel; TabContentsCommandObserver* observer_; // nil if |commands_| is nil LocationBar* locationBarBridge_; TabContents* contents_; // weak + ToolbarModel* toolbarModel_; // weak, one per window IBOutlet NSButton* backButton_; IBOutlet NSButton* forwardButton_; IBOutlet NSButton* reloadStopButton_; @@ -46,7 +48,8 @@ class TabStripModel; - (id)initWithNibName:(NSString*)name bundle:(NSBundle*)bundle contents:(TabContents*)contents - commands:(CommandUpdater*)commands; + commands:(CommandUpdater*)commands + toolbarModel:(ToolbarModel*)toolbarModel; // Take this view (toolbar and web contents) full screen - (IBAction)fullScreen:(id)sender; |