diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
| commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
| tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /chrome/browser/cocoa/tab_contents_controller.mm | |
| parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
| download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 | |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_contents_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/tab_contents_controller.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/cocoa/tab_contents_controller.mm b/chrome/browser/cocoa/tab_contents_controller.mm index 0700341..f20038e 100644 --- a/chrome/browser/cocoa/tab_contents_controller.mm +++ b/chrome/browser/cocoa/tab_contents_controller.mm @@ -58,7 +58,7 @@ class LocationBarBridge : public LocationBar { virtual std::wstring GetInputString() const; virtual WindowOpenDisposition GetWindowOpenDisposition() const { NOTIMPLEMENTED(); return CURRENT_TAB; } - virtual PageTransition::Type GetPageTransition() const + virtual PageTransition::Type GetPageTransition() const { NOTIMPLEMENTED(); return 0; } virtual void AcceptInput() { NOTIMPLEMENTED(); } virtual void FocusLocation(); @@ -71,7 +71,7 @@ class LocationBarBridge : public LocationBar { @implementation TabContentsController -- (id)initWithNibName:(NSString*)name +- (id)initWithNibName:(NSString*)name bundle:(NSBundle*)bundle contents:(TabContents*)contents commands:(CommandUpdater*)commands @@ -97,7 +97,7 @@ class LocationBarBridge : public LocationBar { - (void)awakeFromNib { [contentsBox_ setContentView:contents_->GetNativeView()]; - + // Provide a starting point since we won't get notifications if the state // doesn't change between tabs. [self updateToolbarCommandStatus]; @@ -185,7 +185,7 @@ class LocationBarBridge : public LocationBar { - (void)updateToolbarWithContents:(TabContents*)tab { // TODO(pinkerton): there's a lot of ui code in autocomplete_edit.cc // that we'll want to duplicate. For now, just handle setting the text. - + // TODO(pinkerton): update the security lock icon and background color NSString* urlString = base::SysWideToNSString(toolbarModel_->GetText()); @@ -217,8 +217,8 @@ class LocationBarBridge : public LocationBar { localGrowBox = [contentView convertRect:localGrowBox fromView:[self view]]; // Flip the rect in view coordinates - localGrowBox.origin.y = - [contentView frame].size.height - localGrowBox.origin.y - + localGrowBox.origin.y = + [contentView frame].size.height - localGrowBox.origin.y - localGrowBox.size.height; } return localGrowBox; @@ -252,9 +252,9 @@ TabContentsCommandObserver::~TabContentsCommandObserver() { commands_->RemoveCommandObserver(this); } -void TabContentsCommandObserver::EnabledStateChangedForCommand(int command, +void TabContentsCommandObserver::EnabledStateChangedForCommand(int command, bool enabled) { - [controller_ enabledStateChangedForCommand:command + [controller_ enabledStateChangedForCommand:command enabled:enabled ? YES : NO]; } |