Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/debugger/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
@@ skipping 74 matching lines @@
   return window->tab_contents();
 }
 
 // static
 bool DevToolsWindow::IsDevToolsWindow(RenderViewHost* window_rvh) {
   if (g_instances == NULL)
     return NULL;
   DevToolsWindowList& instances = g_instances.Get();
   for (DevToolsWindowList::iterator it = instances.begin();
        it != instances.end(); ++it) {
-    if ((*it)->tab_contents_->render_view_host() == window_rvh)
+    if ((*it)->tab_contents_->tab_contents()->render_view_host() == window_rvh)
       return true;
   }
   return false;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
   DevToolsWindow* window;
@@ skipping 46 matching lines @@
 
 
 DevToolsWindow* DevToolsWindow::Create(
     Profile* profile,
     RenderViewHost* inspected_rvh,
     bool docked,
     bool shared_worker_frontend) {
   // Create TabContents with devtools.
   TabContentsWrapper* tab_contents =
       Browser::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
-  tab_contents->render_view_host()->AllowBindings(
+  tab_contents->tab_contents()->render_view_host()->AllowBindings(
       content::BINDINGS_POLICY_WEB_UI);
-  tab_contents->controller().LoadURL(
+  tab_contents->tab_contents()->controller().LoadURL(
       GetDevToolsUrl(profile, docked, shared_worker_frontend),
       content::Referrer(),
       content::PAGE_TRANSITION_START_PAGE,
       std::string());
   return new DevToolsWindow(tab_contents, profile, inspected_rvh, docked);
 }
 
 DevToolsWindow::DevToolsWindow(TabContentsWrapper* tab_contents,
                                Profile* profile,
                                RenderViewHost* inspected_rvh,
                                bool docked)
     : profile_(profile),
       inspected_tab_(NULL),
       tab_contents_(tab_contents),
       browser_(NULL),
       docked_(docked),
       is_loaded_(false),
       action_on_load_(DEVTOOLS_TOGGLE_ACTION_NONE),
       frontend_host_(NULL) {
   frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost(
       tab_contents->tab_contents(),
       this);
   g_instances.Get().push_back(this);
   // Wipe out page icon so that the default application icon is used.
-  NavigationEntry* entry = tab_contents_->controller().GetActiveEntry();
+  NavigationEntry* entry =
+      tab_contents_->tab_contents()->controller().GetActiveEntry();
   entry->favicon().set_bitmap(SkBitmap());
   entry->favicon().set_is_valid(true);
 
   // Register on-load actions.
   registrar_.Add(
       this,
       content::NOTIFICATION_LOAD_STOP,
-      content::Source<NavigationController>(&tab_contents_->controller()));
+      content::Source<NavigationController>(
+          &tab_contents_->tab_contents()->controller()));
   registrar_.Add(
       this,
       content::NOTIFICATION_TAB_CLOSING,
-      content::Source<NavigationController>(&tab_contents_->controller()));
+      content::Source<NavigationController>(
+          &tab_contents_->tab_contents()->controller()));
   registrar_.Add(
       this,
       chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(profile_)));
   // There is no inspected_rvh in case of shared workers.
   if (inspected_rvh) {
     TabContents* tab = inspected_rvh->delegate()->GetAsTabContents();
     if (tab)
       inspected_tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tab);
@@ skipping 44 matching lines @@
   if (docked_) {
     Browser* inspected_browser;
     int inspected_tab_index;
     // Tell inspected browser to update splitter and switch to inspected panel.
     if (!IsInspectedBrowserPopupOrPanel() &&
         FindInspectedBrowserAndTabIndex(&inspected_browser,
                                         &inspected_tab_index)) {
       BrowserWindow* inspected_window = inspected_browser->window();
       tab_contents_->tab_contents()->set_delegate(this);
       inspected_window->UpdateDevTools();
-      tab_contents_->view()->SetInitialFocus();
+      tab_contents_->tab_contents()->view()->SetInitialFocus();
       inspected_window->Show();
       TabStripModel* tabstrip_model = inspected_browser->tabstrip_model();
       tabstrip_model->ActivateTabAt(inspected_tab_index, true);
       ScheduleAction(action);
       return;
     } else {
       // Sometimes we don't know where to dock. Stay undocked.
       docked_ = false;
       UpdateFrontendAttachedState();
     }
   }
 
   // Avoid consecutive window switching if the devtools window has been opened
   // and the Inspect Element shortcut is pressed in the inspected tab.
   bool should_show_window =
       !browser_ || action != DEVTOOLS_TOGGLE_ACTION_INSPECT;
 
   if (!browser_)
     CreateDevToolsBrowser();
 
   if (should_show_window) {
     browser_->window()->Show();
-    tab_contents_->view()->SetInitialFocus();
+    tab_contents_->tab_contents()->view()->SetInitialFocus();
   }
 
   ScheduleAction(action);
 }
 
 void DevToolsWindow::RequestSetDocked(bool docked) {
   if (docked_ == docked)
     return;
 
   if (!inspected_tab_)
@@ skipping 20 matching lines @@
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window) {
       inspected_window->UpdateDevTools();
       inspected_window = NULL;
     }
   }
   Show(DEVTOOLS_TOGGLE_ACTION_NONE);
 }
 
 RenderViewHost* DevToolsWindow::GetRenderViewHost() {
-  return tab_contents_->render_view_host();
+  return tab_contents_->tab_contents()->render_view_host();
 }
 
 void DevToolsWindow::CreateDevToolsBrowser() {
   // TODO(pfeldman): Make browser's getter for this key static.
   std::string wp_key;
   wp_key.append(prefs::kBrowserWindowPlacement);
   wp_key.append("_");
   wp_key.append(kDevToolsApp);
 
   PrefService* prefs = profile_->GetPrefs();
@@ skipping 17 matching lines @@
   browser_->tabstrip_model()->AddTabContents(
       tab_contents_, -1, content::PAGE_TRANSITION_START_PAGE,
       TabStripModel::ADD_ACTIVE);
 }
 
 bool DevToolsWindow::FindInspectedBrowserAndTabIndex(Browser** browser,
                                                      int* tab) {
   if (!inspected_tab_)
     return false;
 
-  const NavigationController& controller = inspected_tab_->controller();
+  const NavigationController& controller =
+      inspected_tab_->tab_contents()->controller();
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end(); ++it) {
     int tab_index = (*it)->GetIndexOfController(&controller);
     if (tab_index != TabStripModel::kNoTab) {
       *browser = *it;
       *tab = tab_index;
       return true;
     }
   }
   return false;
 }
 
 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() {
   Browser* browser = NULL;
   int tab;
   return FindInspectedBrowserAndTabIndex(&browser, &tab) ?
       browser->window() : NULL;
 }
 
 bool DevToolsWindow::IsInspectedBrowserPopupOrPanel() {
   Browser* browser = NULL;
   int tab;
   if (!FindInspectedBrowserAndTabIndex(&browser, &tab))
     return false;
 
   return browser->is_type_popup() || browser->is_type_panel();
 }
 
 void DevToolsWindow::UpdateFrontendAttachedState() {
-  tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(
-      string16(),
-      docked_ ? ASCIIToUTF16("WebInspector.setAttachedWindow(true);")
-              : ASCIIToUTF16("WebInspector.setAttachedWindow(false);"));
+  tab_contents_->tab_contents()->render_view_host()->
+      ExecuteJavascriptInWebFrame(
+          string16(),
+          docked_ ? ASCIIToUTF16("WebInspector.setAttachedWindow(true);")
+                  : ASCIIToUTF16("WebInspector.setAttachedWindow(false);"));
 }
 
 
 void DevToolsWindow::AddDevToolsExtensionsToClient() {
   if (inspected_tab_) {
     base::FundamentalValue tabId(
         inspected_tab_->restore_tab_helper()->session_id().id());
     CallClientFunction(ASCIIToUTF16("WebInspector.setInspectedTabId"), tabId);
   }
   ListValue results;
@@ skipping 27 matching lines @@
   }
   return NULL;
 }
 
 void DevToolsWindow::CallClientFunction(const string16& function_name,
                                         const Value& arg) {
   std::string json;
   base::JSONWriter::Write(&arg, false, &json);
   string16 javascript = function_name + char16('(') + UTF8ToUTF16(json) +
       ASCIIToUTF16(");");
-  tab_contents_->render_view_host()->
+  tab_contents_->tab_contents()->render_view_host()->
       ExecuteJavascriptInWebFrame(string16(), javascript);
 }
 
 void DevToolsWindow::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_LOAD_STOP && !is_loaded_) {
     is_loaded_ = true;
     UpdateTheme();
     DoAction();
     AddDevToolsExtensionsToClient();
   } else if (type == content::NOTIFICATION_TAB_CLOSING) {
     if (content::Source<NavigationController>(source).ptr() ==
-            &tab_contents_->controller()) {
+            &tab_contents_->tab_contents()->controller()) {
       // This happens when browser closes all of its tabs as a result
       // of window.Close event.
       // Notify manager that this DevToolsClientHost no longer exists and
       // initiate self-destuct here.
       DevToolsManager::GetInstance()->ClientHostClosing(frontend_host_);
       delete this;
     }
   } else if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     UpdateTheme();
   }
 }
 
 void DevToolsWindow::ScheduleAction(DevToolsToggleAction action) {
   action_on_load_ = action;
   if (is_loaded_)
     DoAction();
 }
 
 void DevToolsWindow::DoAction() {
   UpdateFrontendAttachedState();
   // TODO: these messages should be pushed through the WebKit API instead.
   switch (action_on_load_) {
     case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE:
-      tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(
-          string16(), ASCIIToUTF16("WebInspector.showConsole();"));
+      tab_contents_->tab_contents()->render_view_host()->
+          ExecuteJavascriptInWebFrame(
+              string16(),
+              ASCIIToUTF16("WebInspector.showConsole();"));
       break;
     case DEVTOOLS_TOGGLE_ACTION_INSPECT:
-      tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(
-          string16(), ASCIIToUTF16("WebInspector.toggleSearchingForNode();"));
+      tab_contents_->tab_contents()->render_view_host()->
+          ExecuteJavascriptInWebFrame(
+              string16(),
+              ASCIIToUTF16("WebInspector.toggleSearchingForNode();"));
     case DEVTOOLS_TOGGLE_ACTION_NONE:
       // Do nothing.
       break;
     default:
       NOTREACHED();
   }
   action_on_load_ = DEVTOOLS_TOGGLE_ACTION_NONE;
 }
 
 std::string SkColorToRGBAString(SkColor color) {
@@ skipping 29 matching lines @@
   CHECK(tp);
 
   SkColor color_toolbar =
       tp->GetColor(ThemeService::COLOR_TOOLBAR);
   SkColor color_tab_text =
       tp->GetColor(ThemeService::COLOR_BOOKMARK_TEXT);
   std::string command = StringPrintf(
       "WebInspector.setToolbarColors(\"%s\", \"%s\")",
       SkColorToRGBAString(color_toolbar).c_str(),
       SkColorToRGBAString(color_tab_text).c_str());
-  tab_contents_->render_view_host()->
+  tab_contents_->tab_contents()->render_view_host()->
       ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(command));
 }
 
 void DevToolsWindow::AddNewContents(TabContents* source,
                                     TabContents* new_contents,
                                     WindowOpenDisposition disposition,
                                     const gfx::Rect& initial_pos,
                                     bool user_gesture) {
   if (inspected_tab_) {
     inspected_tab_->tab_contents()->delegate()->AddNewContents(
@@ skipping 78 matching lines @@
 }
 
 void DevToolsWindow::ActivateWindow() {
   if (!docked_) {
     if (!browser_->window()->IsActive()) {
       browser_->window()->Activate();
     }
   } else {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
-      tab_contents_->view()->Focus();
+      tab_contents_->tab_contents()->view()->Focus();
   }
 }
 
 void DevToolsWindow::CloseWindow() {
   DCHECK(docked_);
   DevToolsManager::GetInstance()->ClientHostClosing(frontend_host_);
   InspectedTabClosing();
 }
 
 void DevToolsWindow::MoveWindow(int x, int y) {
@@ skipping 19 matching lines @@
                            content);
 }
 
 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
   if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) {
     return inspected_tab_->tab_contents()->delegate()->
         GetJavaScriptDialogCreator();
   }
   return TabContentsDelegate::GetJavaScriptDialogCreator();
 }