Remove TabContents creation from ShellWindow.

chrome/browser/ui/views/select_file_dialog_extension.cc

 // Copyright (c) 2012 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/select_file_dialog_extension.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/dialogs/selected_file_info.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const int kFileManagerWidth = 954;  // pixels
 const int kFileManagerHeight = 640;  // pixels
@@ skipping 208 matching lines @@
     gfx::NativeWindow owner_window,
     void* params) {
   if (owner_window_) {
     LOG(ERROR) << "File dialog already in use!";
     return;
   }
 
   // The base window to associate the dialog with.
   BaseWindow* base_window = NULL;
 
-  // The tab contents to associate the dialog with.
-  const TabContents* tab = NULL;
+  // The web contents to associate the dialog with.
+  content::WebContents* web_contents = NULL;
 
   // First try to find a Browser using the supplied owner_window. If no owner
   // window has been supplied, this is running from a background page and should
   // be associated with the last active browser.
-  Browser* owner_browser = (owner_window ?
+  Browser* owner_browser = owner_window ?
       browser::FindBrowserWithWindow(owner_window) :
-          BrowserList::GetLastActive());
+          BrowserList::GetLastActive();
   if (owner_browser) {
     base_window = owner_browser->window();
-    tab = chrome::GetActiveTabContents(owner_browser);
-    profile_ = tab->profile();
+    web_contents = chrome::GetActiveWebContents(owner_browser);
+    profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
   } else if (owner_window) {
     // If an owner_window was supplied but we couldn't find a browser, this
     // could be for a shell window.
     // TODO(benwells): Find a better way to get a shell window from a native
     // window.
     std::vector<Profile*> profiles =
         g_browser_process->profile_manager()->GetLoadedProfiles();
     for (std::vector<Profile*>::const_iterator i(profiles.begin());
          i < profiles.end(); ++i) {
       extensions::ShellWindowRegistry* registry =
           extensions::ShellWindowRegistry::Get(*i);
       DCHECK(registry);
       ShellWindow* shell_window = registry->GetShellWindowForNativeWindow(
           owner_window);
       if (shell_window) {
         base_window = shell_window->GetBaseWindow();
-        tab = shell_window->tab_contents();
+        web_contents = shell_window->web_contents();
         profile_ = *i;
         break;
       }
     }
   }
 
   if (!base_window) {
     NOTREACHED() << "Can't find owning window.";
     return;
   }
   DCHECK(profile_);
 
-  // Check if we have another dialog opened in the tab. It's unlikely, but
-  // possible. If there is no tab contents use a tab_id of 0. A dialog without
-  // an associated tab contents will be shown fully screen; only one at a time
+  // Check if we have another dialog opened for the contents. It's unlikely, but
+  // possible. If there is no web contents use a tab_id of -1. A dialog without
+  // an associated web contents will be shown full-screen; only one at a time
   // is allowed in this state.
-  int32 tab_id = tab ? SessionTabHelper::FromWebContents(tab->web_contents())->
-                           session_id().id()
-                     : 0;
+  int32 tab_id = SessionID::IdForTab(web_contents);
   if (PendingExists(tab_id)) {
     DLOG(WARNING) << "Pending dialog exists with id " << tab_id;
     return;
   }
 
   FilePath default_dialog_path;
 
   const PrefService* pref_service = profile_->GetPrefs();
 
   if (default_path.empty() && pref_service) {
@@ skipping 12 matching lines @@
   }
 
   has_multiple_file_type_choices_ =
       file_types ? file_types->extensions.size() > 1 : true;
 
   GURL file_browser_url = file_manager_util::GetFileBrowserUrlWithParams(
       type, title, virtual_path, file_types, file_type_index,
       default_extension);
 
   ExtensionDialog* dialog = ExtensionDialog::Show(file_browser_url,
-      base_window, profile_, tab->web_contents(),
+      base_window, profile_, web_contents,
       kFileManagerWidth, kFileManagerHeight,
 #if defined(USE_AURA)
       file_manager_util::GetTitleFromType(type),
 #else
       // HTML-based header used.
       string16(),
 #endif
       this /* ExtensionDialog::Observer */);
   if (!dialog) {
     LOG(ERROR) << "Unable to create extension dialog";
     return;
   }
 
   dialog->SetMinimumContentsSize(kFileManagerMinimumWidth,
                                  kFileManagerMinimumHeight);
 
   // Connect our listener to FileDialogFunction's per-tab callbacks.
   AddPending(tab_id);
 
   extension_dialog_ = dialog;
   params_ = params;
   tab_id_ = tab_id;
   owner_window_ = owner_window;
 }