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

Side by Side Diff: content/browser/android/content_view_core_impl.cc

Issue 637083002: Sets the default background color of inline signin and user manager to grey (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "content/browser/android/content_view_core_impl.h" 5 #include "content/browser/android/content_view_core_impl.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 GetWebContents()->GetRoutingID(), rect)); 1235 GetWebContents()->GetRoutingID(), rect));
1236 } 1236 }
1237 1237
1238 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) { 1238 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) {
1239 return GetRenderProcessIdFromRenderViewHost( 1239 return GetRenderProcessIdFromRenderViewHost(
1240 web_contents_->GetRenderViewHost()); 1240 web_contents_->GetRenderViewHost());
1241 } 1241 }
1242 1242
1243 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj, 1243 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj,
1244 jboolean opaque) { 1244 jboolean opaque) {
1245 if (GetRenderWidgetHostViewAndroid()) 1245 if (GetRenderWidgetHostViewAndroid()) {
1246 GetRenderWidgetHostViewAndroid()->SetBackgroundOpaque(opaque); 1246 if (opaque)
1247 GetRenderWidgetHostViewAndroid()->SetBackgroundColorToDefault();
1248 else
1249 GetRenderWidgetHostViewAndroid()->SetBackgroundColor(SK_ColorTRANSPARENT);
1250 }
1247 } 1251 }
1248 1252
1249 void ContentViewCoreImpl::RequestTextSurroundingSelection( 1253 void ContentViewCoreImpl::RequestTextSurroundingSelection(
1250 int max_length, 1254 int max_length,
1251 const base::Callback< 1255 const base::Callback<
1252 void(const base::string16& content, int start_offset, int end_offset)>& 1256 void(const base::string16& content, int start_offset, int end_offset)>&
1253 callback) { 1257 callback) {
1254 DCHECK(!callback.is_null()); 1258 DCHECK(!callback.is_null());
1255 RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame(); 1259 RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame();
1256 if (!focused_frame) 1260 if (!focused_frame)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 reinterpret_cast<ui::WindowAndroid*>(window_android), 1303 reinterpret_cast<ui::WindowAndroid*>(window_android),
1300 retained_objects_set); 1304 retained_objects_set);
1301 return reinterpret_cast<intptr_t>(view); 1305 return reinterpret_cast<intptr_t>(view);
1302 } 1306 }
1303 1307
1304 bool RegisterContentViewCore(JNIEnv* env) { 1308 bool RegisterContentViewCore(JNIEnv* env) {
1305 return RegisterNativesImpl(env); 1309 return RegisterNativesImpl(env);
1306 } 1310 }
1307 1311
1308 } // namespace content 1312 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698