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

Side by Side Diff: chrome/browser/ui/android/context_menu_helper.cc

Issue 1126203011: Start displaying title text for HTML elements without links. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/android/context_menu_helper.h" 5 #include "chrome/browser/ui/android/context_menu_helper.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "content/public/browser/android/content_view_core.h" 9 #include "content/public/browser/android/content_view_core.h"
10 #include "content/public/browser/android/download_controller_android.h" 10 #include "content/public/browser/android/download_controller_android.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 base::android::ScopedJavaLocalRef<jobject> jmenu_info = 79 base::android::ScopedJavaLocalRef<jobject> jmenu_info =
80 ContextMenuParamsAndroid::Java_ContextMenuParams_create( 80 ContextMenuParamsAndroid::Java_ContextMenuParams_create(
81 env, 81 env,
82 params.media_type, 82 params.media_type,
83 ConvertUTF8ToJavaString(env, params.page_url.spec()).obj(), 83 ConvertUTF8ToJavaString(env, params.page_url.spec()).obj(),
84 ConvertUTF8ToJavaString(env, params.link_url.spec()).obj(), 84 ConvertUTF8ToJavaString(env, params.link_url.spec()).obj(),
85 ConvertUTF16ToJavaString(env, params.link_text).obj(), 85 ConvertUTF16ToJavaString(env, params.link_text).obj(),
86 ConvertUTF8ToJavaString(env, params.unfiltered_link_url.spec()).obj(), 86 ConvertUTF8ToJavaString(env, params.unfiltered_link_url.spec()).obj(),
87 ConvertUTF8ToJavaString(env, params.src_url.spec()).obj(), 87 ConvertUTF8ToJavaString(env, params.src_url.spec()).obj(),
88 ConvertUTF16ToJavaString(env, params.selection_text).obj(), 88 ConvertUTF16ToJavaString(env, params.selection_text).obj(),
89 ConvertUTF16ToJavaString(env, params.title_text).obj(),
89 params.is_editable, 90 params.is_editable,
90 ConvertUTF8ToJavaString(env, sanitizedReferrer.spec()).obj(), 91 ConvertUTF8ToJavaString(env, sanitizedReferrer.spec()).obj(),
91 params.referrer_policy); 92 params.referrer_policy);
92 93
93 std::vector<content::MenuItem>::const_iterator i; 94 std::vector<content::MenuItem>::const_iterator i;
94 for (i = params.custom_items.begin(); i != params.custom_items.end(); ++i) { 95 for (i = params.custom_items.begin(); i != params.custom_items.end(); ++i) {
95 ContextMenuParamsAndroid::Java_ContextMenuParams_addCustomItem( 96 ContextMenuParamsAndroid::Java_ContextMenuParams_addCustomItem(
96 env, 97 env,
97 jmenu_info.obj(), 98 jmenu_info.obj(),
98 ConvertUTF16ToJavaString(env, i->label).obj(), 99 ConvertUTF16ToJavaString(env, i->label).obj(),
(...skipping 18 matching lines...) Expand all
117 content::DownloadControllerAndroid::Get()->StartContextMenuDownload( 118 content::DownloadControllerAndroid::Get()->StartContextMenuDownload(
118 context_menu_params_, 119 context_menu_params_,
119 web_contents_, 120 web_contents_,
120 jis_link); 121 jis_link);
121 } 122 }
122 123
123 bool RegisterContextMenuHelper(JNIEnv* env) { 124 bool RegisterContextMenuHelper(JNIEnv* env) {
124 return RegisterNativesImpl(env) && 125 return RegisterNativesImpl(env) &&
125 ContextMenuParamsAndroid::RegisterNativesImpl(env); 126 ContextMenuParamsAndroid::RegisterNativesImpl(env);
126 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698