summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_window_controller.mm
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browser_window_controller.mm')
-rw-r--r--chrome/browser/browser_window_controller.mm23
1 files changed, 4 insertions, 19 deletions
diff --git a/chrome/browser/browser_window_controller.mm b/chrome/browser/browser_window_controller.mm
index bb5b9cc..94ab55b 100644
--- a/chrome/browser/browser_window_controller.mm
+++ b/chrome/browser/browser_window_controller.mm
@@ -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