| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/web_contents/web_contents_view_android.h" | 5 #include "content/browser/web_contents/web_contents_view_android.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 "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 // TODO(husky): Remove any system controls from availableRect. | 35 // TODO(husky): Remove any system controls from availableRect. |
| 36 results->available_rect = display.work_area(); | 36 results->available_rect = display.work_area(); |
| 37 results->device_scale_factor = display.device_scale_factor(); | 37 results->device_scale_factor = display.device_scale_factor(); |
| 38 results->orientation_angle = display.RotationAsDegree(); | 38 results->orientation_angle = display.RotationAsDegree(); |
| 39 results->orientation_type = | 39 results->orientation_type = |
| 40 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display); | 40 RenderWidgetHostViewBase::GetOrientationTypeForMobile(display); |
| 41 gfx::DeviceDisplayInfo info; | 41 gfx::DeviceDisplayInfo info; |
| 42 results->depth = display.color_depth(); | 42 results->depth = display.color_depth(); |
| 43 results->depth_per_component = display.depth_per_component(); | 43 results->depth_per_component = display.depth_per_component(); |
| 44 results->is_monochrome = display.is_monochrome(); | 44 results->is_monochrome = display.is_monochrome(); |
| 45 results->is_virtual = display.is_virtual(); |
| 45 } | 46 } |
| 46 } | 47 } |
| 47 | 48 |
| 48 // static | 49 // static |
| 49 void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) { | 50 void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) { |
| 50 DisplayToScreenInfo(display::Screen::GetScreen()->GetPrimaryDisplay(), | 51 DisplayToScreenInfo(display::Screen::GetScreen()->GetPrimaryDisplay(), |
| 51 results); | 52 results); |
| 52 } | 53 } |
| 53 | 54 |
| 54 // static | 55 // static |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 // This is called when we the renderer asks us to take focus back (i.e., it has | 365 // This is called when we the renderer asks us to take focus back (i.e., it has |
| 365 // iterated past the last focusable element on the page). | 366 // iterated past the last focusable element on the page). |
| 366 void WebContentsViewAndroid::TakeFocus(bool reverse) { | 367 void WebContentsViewAndroid::TakeFocus(bool reverse) { |
| 367 if (web_contents_->GetDelegate() && | 368 if (web_contents_->GetDelegate() && |
| 368 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) | 369 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) |
| 369 return; | 370 return; |
| 370 web_contents_->GetRenderWidgetHostView()->Focus(); | 371 web_contents_->GetRenderWidgetHostView()->Focus(); |
| 371 } | 372 } |
| 372 | 373 |
| 373 } // namespace content | 374 } // namespace content |
| OLD | NEW |