Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2638)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/shortcut_helper.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/omnibox/autocomplete_controller_android.cc ('k') | chrome/browser/android/tab/thumbnail_tab_helper_android.cc » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/shortcut_helper.cc
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index f2cc790530a1011f21b97e9f609d5b9f5ca52143..0cdf37182af77965448b77cdc2d369a1bf17dd80 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -24,10 +24,14 @@
using content::Manifest;
jlong Initialize(JNIEnv* env, jobject obj, jobject java_web_contents) {
+#if !defined(USE_AURA)
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(java_web_contents);
ShortcutHelper* shortcut_helper = new ShortcutHelper(env, obj, web_contents);
return reinterpret_cast<intptr_t>(shortcut_helper);
+#else
+ return reinterpret_cast<intptr_t>(1);
+#endif
}
ShortcutHelper::ShortcutHelper(JNIEnv* env,
« no previous file with comments | « chrome/browser/android/omnibox/autocomplete_controller_android.cc ('k') | chrome/browser/android/tab/thumbnail_tab_helper_android.cc » ('j') | content/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698