Rename TabContents::controller() to GetController and put it into the WebContents interface.

chrome/browser/ui/views/sad_tab_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/sad_tab_view.h"
 
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 57 matching lines @@
                                                   chrome::kCrashReasonURL :
                                                   chrome::kKillReasonURL));
     tab_contents_->OpenURL(OpenURLParams(
         help_url,
         content::Referrer(),
         CURRENT_TAB,
         content::PAGE_TRANSITION_LINK,
         false /* is renderer initiated */));
   } else if (source == feedback_link_) {
     browser::ShowHtmlBugReportView(
-        Browser::GetBrowserForController(&tab_contents_->controller(), NULL),
+        Browser::GetBrowserForController(&tab_contents_->GetController(), NULL),
         l10n_util::GetStringUTF8(IDS_KILLED_TAB_FEEDBACK_MESSAGE),
         userfeedback::ChromeOsData_ChromeOsCategory_CRASH);
   }
 }
 
 void SadTabView::ButtonPressed(views::Button* source,
                                const views::Event& event) {
   DCHECK(tab_contents_);
   DCHECK(source == reload_button_);
-  tab_contents_->controller().Reload(true);
+  tab_contents_->GetController().Reload(true);
 }
 
 void SadTabView::Layout() {
   // Specify the maximum message width explicitly.
   message_->SizeToFit(static_cast<int>(width() * kMessageSize));
   View::Layout();
 }
 
 void SadTabView::ViewHierarchyChanged(bool is_add,
                                       views::View* parent,
@@ skipping 94 matching lines @@
 views::Link* SadTabView::CreateLink(const string16& text) {
   views::Link* link = new views::Link(text);
   link->SetFont(base_font_.DeriveFont(kMessageFontSizeDelta));
   link->SetBackgroundColor(background()->get_color());
   link->SetEnabledColor(kTextColor);
   link->set_listener(this);
   return link;
 }