Move dispatching and sending of the last extension specific messages out of TabContents and Rende...

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1785 matching lines @@
   NavigationEntry* entry = current_tab->controller().GetLastCommittedEntry();
   if (!entry)
     return;
 
   // RVH's GetApplicationInfo should not be called before it returns.
   DCHECK(pending_web_app_action_ == NONE);
   pending_web_app_action_ = CREATE_SHORTCUT;
 
   // Start fetching web app info for CreateApplicationShortcut dialog and show
   // the dialog when the data is available in OnDidGetApplicationInfo.
-  current_tab->render_view_host()->GetApplicationInfo(entry->page_id());
+  current_tab->extension_tab_helper()->GetApplicationInfo(entry->page_id());
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 void Browser::ToggleDevToolsWindow(DevToolsToggleAction action) {
   std::string uma_string;
   switch (action) {
     case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE:
       uma_string = "DevTools_ToggleConsole";
@@ skipping 1111 matching lines @@
     }
 
     if (!source->is_loading() &&
         pending_web_app_action_ == UPDATE_SHORTCUT) {
       // Schedule a shortcut update when web application info is available if
       // last committed entry is not NULL. Last committed entry could be NULL
       // when an interstitial page is injected (e.g. bad https certificate,
       // malware site etc). When this happens, we abort the shortcut update.
       NavigationEntry* entry = source->controller().GetLastCommittedEntry();
       if (entry) {
-        source->render_view_host()->GetApplicationInfo(entry->page_id());
+        TabContentsWrapper::GetCurrentWrapperForContents(source)->
+            extension_tab_helper()->GetApplicationInfo(entry->page_id());
       } else {
         pending_web_app_action_ = NONE;
       }
     }
   }
 }
 
 void Browser::CloseContents(TabContents* source) {
   if (is_attempting_to_close_browser_) {
     // If we're trying to close the browser, just clear the state related to
@@ skipping 280 matching lines @@
   window()->ShowCollectedCookiesDialog(tab_contents);
 }
 
 bool Browser::ShouldAddNavigationToHistory(
     const history::HistoryAddPageArgs& add_page_args,
     NavigationType::Type navigation_type) {
   // Don't update history if running as app.
   return !IsApplication();
 }
 
-void Browser::OnDidGetApplicationInfo(TabContents* tab_contents,
+void Browser::ContentRestrictionsChanged(TabContents* source) {
+  UpdateCommandsForContentRestrictionState();
+}
+
+void Browser::WorkerCrashed() {
+  TabContents* tab_contents = GetSelectedTabContents();
+  if (!tab_contents)
+    return;
+  tab_contents->AddInfoBar(new SimpleAlertInfoBarDelegate(tab_contents, NULL,
+      l10n_util::GetStringUTF16(IDS_WEBWORKER_CRASHED_PROMPT), true));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Browser, TabContentsWrapperDelegate implementation:
+
+void Browser::URLStarredChanged(TabContentsWrapper* source, bool starred) {
+  if (source == GetSelectedTabContentsWrapper())
+    window_->SetStarredState(starred);
+}
+
+void Browser::OnDidGetApplicationInfo(TabContentsWrapper* source,
                                       int32 page_id) {
-  TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
-  if (current_tab->tab_contents() != tab_contents)
+  if (GetSelectedTabContentsWrapper() != source)
     return;
 
-  NavigationEntry* entry = current_tab->controller().GetLastCommittedEntry();
+  NavigationEntry* entry = source->controller().GetLastCommittedEntry();
   if (!entry || (entry->page_id() != page_id))
     return;
 
   switch (pending_web_app_action_) {
     case CREATE_SHORTCUT: {
-      window()->ShowCreateWebAppShortcutsDialog(current_tab);
+      window()->ShowCreateWebAppShortcutsDialog(source);
       break;
     }
     case UPDATE_SHORTCUT: {
-      web_app::UpdateShortcutForTabContents(current_tab);
+      web_app::UpdateShortcutForTabContents(source);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
   pending_web_app_action_ = NONE;
 }
 
-void Browser::OnInstallApplication(TabContents* source,
+void Browser::OnInstallApplication(TabContentsWrapper* source,
                                    const WebApplicationInfo& web_app) {
   ExtensionService* extensions_service = profile()->GetExtensionService();
   if (!extensions_service)
     return;
 
   scoped_refptr<CrxInstaller> installer(
       new CrxInstaller(extensions_service,
                        extensions_service->show_extensions_prompts() ?
                        new ExtensionInstallUI(profile()) : NULL));
   installer->InstallWebApp(web_app);
 }
 
-void Browser::ContentRestrictionsChanged(TabContents* source) {
-  UpdateCommandsForContentRestrictionState();
-}
-
-void Browser::WorkerCrashed() {
-  TabContents* tab_contents = GetSelectedTabContents();
-  if (!tab_contents)
-    return;
-  tab_contents->AddInfoBar(new SimpleAlertInfoBarDelegate(tab_contents, NULL,
-      l10n_util::GetStringUTF16(IDS_WEBWORKER_CRASHED_PROMPT), true));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Browser, TabContentsWrapperDelegate implementation:
-
-void Browser::URLStarredChanged(TabContentsWrapper* source, bool starred) {
-  if (source == GetSelectedTabContentsWrapper())
-    window_->SetStarredState(starred);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, SearchEngineTabHelperDelegate implementation:
 
 void Browser::ConfirmSetDefaultSearchProvider(
     TabContents* tab_contents,
     TemplateURL* template_url,
     TemplateURLModel* template_url_model) {
   window()->ConfirmSetDefaultSearchProvider(tab_contents, template_url,
                                             template_url_model);
 }
@@ skipping 1105 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&view_source_contents->controller(), false);
   }
 }