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

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

Issue 654123004: Revert of 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: 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 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 GetWebContents()->GetRoutingID(), rect)); 1274 GetWebContents()->GetRoutingID(), rect));
1275 } 1275 }
1276 1276
1277 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) { 1277 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) {
1278 return GetRenderProcessIdFromRenderViewHost( 1278 return GetRenderProcessIdFromRenderViewHost(
1279 web_contents_->GetRenderViewHost()); 1279 web_contents_->GetRenderViewHost());
1280 } 1280 }
1281 1281
1282 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj, 1282 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj,
1283 jboolean opaque) { 1283 jboolean opaque) {
1284 if (GetRenderWidgetHostViewAndroid()) { 1284 if (GetRenderWidgetHostViewAndroid())
1285 if (opaque) 1285 GetRenderWidgetHostViewAndroid()->SetBackgroundOpaque(opaque);
1286 GetRenderWidgetHostViewAndroid()->SetBackgroundColorToDefault();
1287 else
1288 GetRenderWidgetHostViewAndroid()->SetBackgroundColor(SK_ColorTRANSPARENT);
1289 }
1290 } 1286 }
1291 1287
1292 void ContentViewCoreImpl::RequestTextSurroundingSelection( 1288 void ContentViewCoreImpl::RequestTextSurroundingSelection(
1293 int max_length, 1289 int max_length,
1294 const base::Callback< 1290 const base::Callback<
1295 void(const base::string16& content, int start_offset, int end_offset)>& 1291 void(const base::string16& content, int start_offset, int end_offset)>&
1296 callback) { 1292 callback) {
1297 DCHECK(!callback.is_null()); 1293 DCHECK(!callback.is_null());
1298 RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame(); 1294 RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame();
1299 if (!focused_frame) 1295 if (!focused_frame)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 reinterpret_cast<ui::WindowAndroid*>(window_android), 1338 reinterpret_cast<ui::WindowAndroid*>(window_android),
1343 retained_objects_set); 1339 retained_objects_set);
1344 return reinterpret_cast<intptr_t>(view); 1340 return reinterpret_cast<intptr_t>(view);
1345 } 1341 }
1346 1342
1347 bool RegisterContentViewCore(JNIEnv* env) { 1343 bool RegisterContentViewCore(JNIEnv* env) {
1348 return RegisterNativesImpl(env); 1344 return RegisterNativesImpl(env);
1349 } 1345 }
1350 1346
1351 } // namespace content 1347 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698