aura: Fix file-opening functions in platform_util.
This removes NOTIMPLEMENTED()s for platform_util's
ShowItemInFolder(), OpenItem(), and OpenExternal(). We now
use the native Chrome OS, Windows, or Linux versions of
these functions.
BUG=99712
TEST=manual: checked that we use the file manager extension to open downloaded files on Chrome OS and that we use XDG on linux
Review URL: http://codereview.chromium.org/8808003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113157 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc
index 62d06012f..7f29fdc7 100644
--- a/chrome/browser/platform_util_aura.cc
+++ b/chrome/browser/platform_util_aura.cc
@@ -9,21 +9,6 @@
namespace platform_util {
-void ShowItemInFolder(const FilePath& full_path) {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
-void OpenItem(const FilePath& full_path) {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
-void OpenExternal(const GURL& url) {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
gfx::NativeWindow GetTopLevel(gfx::NativeView view) {
return view->GetToplevelWindow();
}
diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc
index 1064a34..f003769 100644
--- a/chrome/browser/platform_util_linux.cc
+++ b/chrome/browser/platform_util_linux.cc
@@ -4,8 +4,6 @@
#include "chrome/browser/platform_util.h"
-#include <gtk/gtk.h>
-
#include "base/bind.h"
#include "base/file_util.h"
#include "base/process_util.h"
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index 251cb9c..8f211e2 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -174,6 +174,7 @@
}
}
+#if !defined(USE_AURA)
gfx::NativeWindow GetTopLevel(gfx::NativeView view) {
return ::GetAncestor(view, GA_ROOT);
}
@@ -194,5 +195,6 @@
// MSVC complains if we don't include != 0.
return ::IsWindowVisible(view) != 0;
}
+#endif
} // namespace platform_util
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0538e06..4545e7b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4178,7 +4178,6 @@
['exclude', '^browser/google/google_update.cc'],
['exclude', '^browser/google/google_update.h'],
['exclude', '^browser/hang_monitor/'],
- ['exclude', '^browser/platform_util_win.cc'],
['exclude', '^browser/plugin_download_helper.cc'],
['exclude', '^browser/plugin_download_helper.h'],
['exclude', '^browser/renderer_host/render_widget_host_view_views*'],
@@ -5109,7 +5108,6 @@
['exclude', '^browser/google/google_update.cc'],
['exclude', '^browser/google/google_update.h'],
['exclude', '^browser/platform_util_common_linux.cc'],
- ['exclude', '^browser/platform_util_linux.cc'],
['exclude', '^browser/ui/input_window_dialog.h'],
['exclude', '^browser/ui/input_window_dialog_win.cc'],
['include', '^browser/ui/views/aura/'],