Commit ece92328 authored by bshe's avatar bshe Committed by Commit bot

Aura Android: upstream platform_util* related files

BUG=561669

Review URL: https://codereview.chromium.org/1478493004

Cr-Commit-Position: refs/heads/master@{#363026}
parent 7115a704
...@@ -358,6 +358,13 @@ source_set("browser") { ...@@ -358,6 +358,13 @@ source_set("browser") {
if (toolkit_views) { if (toolkit_views) {
deps += [ "//ui/views" ] deps += [ "//ui/views" ]
} }
if (is_android && use_aura) {
sources -= [
# Aura Android uses platform_util_aura implementation.
"platform_util_android.cc",
]
}
} else { # iOS } else { # iOS
sources += sources +=
rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome")
......
...@@ -98,7 +98,7 @@ bool IsVisible(gfx::NativeView view); ...@@ -98,7 +98,7 @@ bool IsVisible(gfx::NativeView view);
bool IsSwipeTrackingFromScrollEventsEnabled(); bool IsSwipeTrackingFromScrollEventsEnabled();
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID) && !defined(USE_AURA)
bool RegisterPlatformUtil(JNIEnv* env); bool RegisterPlatformUtil(JNIEnv* env);
#endif #endif
} // namespace platform_util } // namespace platform_util
......
...@@ -13,6 +13,25 @@ ...@@ -13,6 +13,25 @@
namespace platform_util { namespace platform_util {
#if defined(OS_ANDROID)
// TODO(bshe): We might want to use platform_util_android.cc for Aura Android.
// See crbug.com/561664
void ShowItemInFolder(Profile* profile, const base::FilePath& full_path) {
NOTIMPLEMENTED();
}
void OpenItem(Profile* profile,
const base::FilePath& full_path,
OpenItemType item_type,
const OpenOperationCallback& callback) {
NOTIMPLEMENTED();
}
void OpenExternal(Profile* profile, const GURL& url) {
NOTIMPLEMENTED();
}
#endif
gfx::NativeWindow GetTopLevel(gfx::NativeView view) { gfx::NativeWindow GetTopLevel(gfx::NativeView view) {
return view->GetToplevelWindow(); return view->GetToplevelWindow();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment