Changing chromeos so that ctrl-o opens the filebrowser

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1756009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45488 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 3 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 580f559..fe7f95e 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1382,6 +1382,12 @@ void Browser::FocusSearch() {
 
 void Browser::OpenFile() {
   UserMetrics::RecordAction(UserMetricsAction("OpenFile"), profile_);
+#if defined(OS_CHROMEOS)
+  FileBrowseUI::OpenPopup(profile_,
+                          "",
+                          FileBrowseUI::kPopupWidth,
+                          FileBrowseUI::kPopupHeight);
+#else
   if (!select_file_dialog_.get())
     select_file_dialog_ = SelectFileDialog::Create(this);
 
@@ -1391,6 +1397,7 @@ void Browser::OpenFile() {
                                   string16(), FilePath(),
                                   NULL, 0, FILE_PATH_LITERAL(""),
                                   parent_window, NULL);
+#endif
 }
 
 void Browser::OpenCreateShortcutsDialog() {
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 36f588f..7730e6c 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -966,9 +966,13 @@ Browser* FileBrowseUI::OpenPopup(Profile* profile,
   // Create new browser if no matching pop up found.
   if (browser == NULL) {
     browser = Browser::CreateForPopup(profile);
-
-    std::string url(kFilebrowseURLHash);
-    url.append(hashArgument);
+    std::string url;
+    if (hashArgument.empty()) {
+      url = chrome::kChromeUIFileBrowseURL;
+    } else {
+      url = kFilebrowseURLHash;
+      url.append(hashArgument);
+    }
 
     browser->AddTabWithURL(
         GURL(url), GURL(), PageTransition::LINK,