| Index: chrome/browser/browser_window_controller.mm
|
| ===================================================================
|
| --- chrome/browser/browser_window_controller.mm (revision 8452)
|
| +++ chrome/browser/browser_window_controller.mm (working copy)
|
| @@ -14,7 +14,7 @@
|
| - (id)initWithBrowser:(Browser*)browser {
|
| if ((self = [super initWithWindowNibName:@"BrowserWindow"])) {
|
| browser_ = browser;
|
| - window_shim_ = new BrowserWindowCocoa(self, [self window]);
|
| + windowShim_ = new BrowserWindowCocoa(self, [self window]);
|
| }
|
| return self;
|
| }
|
| @@ -22,18 +22,17 @@
|
| - (void)dealloc {
|
| browser_->CloseAllTabs();
|
| delete browser_;
|
| - delete window_shim_;
|
| + delete windowShim_;
|
| [super dealloc];
|
| }
|
|
|
| // Access the C++ bridge between the NSWindow and the rest of Chromium
|
| - (BrowserWindow*)browserWindow {
|
| - return window_shim_;
|
| + return windowShim_;
|
| }
|
|
|
| - (void)windowDidLoad {
|
| - [(NSControl*)[url_bar_ view]
|
| - setStringValue:@"http://the.interwebs.start.here"];
|
| + [urlBarView_ setStringValue:@"http://the.interwebs.start.here"];
|
| }
|
|
|
| - (void)destroyBrowser {
|
| @@ -88,18 +87,4 @@
|
| browser_->ExecuteCommand(tag);
|
| }
|
|
|
| -// NSToolbar delegate methods
|
| -
|
| -- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar {
|
| - return [NSArray arrayWithObjects:[back_button_ itemIdentifier],
|
| - [forward_button_ itemIdentifier],
|
| - [url_bar_ itemIdentifier], nil];
|
| -}
|
| -
|
| -- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {
|
| - return [NSArray arrayWithObjects:[back_button_ itemIdentifier],
|
| - [forward_button_ itemIdentifier],
|
| - [url_bar_ itemIdentifier], nil];
|
| -}
|
| -
|
| @end
|
|
|