Get FileSelect dialog work on athena

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/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/select_file_dialog_util.h"
 #include "chrome/browser/chromeos/file_manager/url_util.h"
 #include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.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_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extension_system.h"
 #include "ui/base/base_window.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(USE_ATHENA)
+#include "chrome/browser/ui/views/athena/athena_util.h"
+#endif  // USE_ATHENA
+
 using extensions::AppWindow;
 using content::BrowserThread;
 
 namespace {
 
 const int kFileManagerWidth = 972;  // pixels
 const int kFileManagerHeight = 640;  // pixels
 const int kFileManagerMinimumWidth = 640;  // pixels
 const int kFileManagerMinimumHeight = 240;  // pixels
 
@@ skipping 34 matching lines @@
 }
 
 scoped_refptr<SelectFileDialogExtension> PendingDialog::Find(
     SelectFileDialogExtension::RoutingID id) {
   Map::const_iterator it = map_.find(id);
   if (it == map_.end())
     return NULL;
   return it->second;
 }
 
-
+#if defined(USE_ATHENA)
+void FindRuntimeContext(gfx::NativeWindow owner_window,
+                        ui::BaseWindow** base_window,
+                        content::WebContents** web_contents) {
+  *base_window = NULL;
+  *web_contents = GetWebContentsForWindow(owner_window);
+}
+#else  // USE_ATHENA
 // Given |owner_window| finds corresponding |base_window|, it's associated
 // |web_contents| and |profile|.
-void FindRuntimeContext(
-    gfx::NativeWindow owner_window,
-    ui::BaseWindow** base_window,
-    content::WebContents** web_contents,
-    Profile** profile) {
+void FindRuntimeContext(gfx::NativeWindow owner_window,
+                        ui::BaseWindow** base_window,
+                        content::WebContents** web_contents) {
   *base_window = NULL;
   *web_contents = NULL;
-  *profile = NULL;
-  // To get the base_window and profile, either a Browser or AppWindow is
+  // To get the base_window and web contents, either a Browser or AppWindow is
   // needed.
   Browser* owner_browser =  NULL;
   AppWindow* app_window = NULL;
 
   // If owner_window is supplied, use that to find a browser or a app window.
   if (owner_window) {
     owner_browser = chrome::FindBrowserWithWindow(owner_window);
     if (!owner_browser) {
       // If an owner_window was supplied but we couldn't find a browser, this
       // could be for a app window.
@@ skipping 20 matching lines @@
     }
   }
 
   // In ChromeOS kiosk launch mode, we can still show file picker for
   // certificate manager dialog. There are no browser or webapp window
   // instances present in this case.
   if (chrome::IsRunningInForcedAppMode() && !(*web_contents))
     *web_contents = chromeos::LoginWebDialog::GetCurrentWebContents();
 
   CHECK(web_contents);
-  *profile = Profile::FromBrowserContext((*web_contents)->GetBrowserContext());
 }
+#endif  // USE_ATHENA
 
 }  // namespace
 
 /////////////////////////////////////////////////////////////////////////////
 
 // static
 SelectFileDialogExtension::RoutingID
 SelectFileDialogExtension::GetRoutingIDFromWebContents(
     const content::WebContents* web_contents) {
   // Use the raw pointer value as the identifier. Previously we have used the
@@ skipping 168 matching lines @@
   if (owner_window_) {
     LOG(ERROR) << "File dialog already in use!";
     return;
   }
 
   // The base window to associate the dialog with.
   ui::BaseWindow* base_window = NULL;
 
   // The web contents to associate the dialog with.
   content::WebContents* web_contents = NULL;
-
-  FindRuntimeContext(owner_window, &base_window, &web_contents, &profile_);
+  FindRuntimeContext(owner_window, &base_window, &web_contents);
+  CHECK(web_contents);
+  profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
   CHECK(profile_);
 
   // Check if we have another dialog opened for the contents. It's unlikely, but
   // possible. In such situation, discard this request.
   RoutingID routing_id = GetRoutingIDFromWebContents(web_contents);
   if (PendingExists(routing_id))
     return;
 
   const PrefService* pref_service = profile_->GetPrefs();
   DCHECK(pref_service);
@@ skipping 76 matching lines @@
   }
 
   // Connect our listener to FileDialogFunction's per-tab callbacks.
   AddPending(routing_id);
 
   extension_dialog_ = dialog;
   params_ = params;
   routing_id_ = routing_id;
   owner_window_ = owner_window;
 }