summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/tab_contents.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.cc')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 8c491e6..b866589 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -107,11 +107,10 @@ void TabContents::Destroy() {
// Notify our NavigationController. Make sure we are deleted first, so
// that the controller is the last to die.
NavigationController* controller = controller_;
- TabContentsType type = this->type();
delete this;
- controller->TabContentsWasDestroyed(type);
+ controller->TabContentsWasDestroyed();
}
void TabContents::SetupController(Profile* profile) {
@@ -263,7 +262,7 @@ void TabContents::OpenURL(const GURL& url, const GURL& referrer,
bool TabContents::NavigateToPendingEntry(bool reload) {
// Our benavior is just to report that the entry was committed.
string16 default_title = WideToUTF16Hack(GetDefaultTitle());
- controller()->GetPendingEntry()->set_title(default_title);
+ controller()->pending_entry()->set_title(default_title);
controller()->CommitPendingEntry();
return true;
}