Lock screen for Chrome-Athena

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/display_info_provider_chromeos.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 using ash::DisplayManager;
 
 namespace extensions {
 
 using core_api::system_display::Bounds;
 using core_api::system_display::DisplayUnitInfo;
 using core_api::system_display::DisplayProperties;
 using core_api::system_display::Insets;
 
 namespace {
 
-// TODO(hshi): determine the DPI of the screen.
-const float kDpi96 = 96.0;
 // Maximum allowed bounds origin absolute value.
 const int kMaxBoundsOrigin = 200 * 1000;
 
 // Checks if the given integer value is valid display rotation in degrees.
 bool IsValidRotationValue(int rotation) {
   return rotation == 0 || rotation == 90 || rotation == 180 || rotation == 270;
 }
 
 // Converts integer integer value in degrees to Rotation enum value.
 gfx::Display::Rotation DegreesToRotation(int degrees) {
@@ skipping 313 matching lines @@
     UpdateDisplayLayout(
         primary.bounds(), primary.id(), target_bounds, target.id());
   }
 
   return true;
 }
 
 void DisplayInfoProviderChromeOS::UpdateDisplayUnitInfoForPlatform(
     const gfx::Display& display,
     extensions::core_api::system_display::DisplayUnitInfo* unit) {
+#if !defined(USE_ATHENA)
+  // TODO(dpolukhin): put something reasonable to the unit without ash::Shell.

[Jun Mukai, 2014/10/13 18:20:25]

Please note crbug.com/416961
Also I'm not sure why this is involved to screen locks.  Possibly better to
separate into another CL?

[Dmitry Polukhin, 2014/10/14 11:20:34]

Lock screen triggers crash without this #ifdef. Added link to the bug.

   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   unit->name = display_manager->GetDisplayNameForId(display.id());
   if (display_manager->IsMirrored()) {
     unit->mirroring_source_id =
         base::Int64ToString(display_manager->mirrored_display_id());
   }
 
+  // TODO(hshi): determine the DPI of the screen.
+  const float kDpi96 = 96.0;
+
   const float dpi = display.device_scale_factor() * kDpi96;
   unit->dpi_x = dpi;
   unit->dpi_y = dpi;
 
   const gfx::Insets overscan_insets =
       display_manager->GetOverscanInsets(display.id());
   unit->overscan.left = overscan_insets.left();
   unit->overscan.top = overscan_insets.top();
   unit->overscan.right = overscan_insets.right();
   unit->overscan.bottom = overscan_insets.bottom();
+#endif
 }
 
 gfx::Screen* DisplayInfoProviderChromeOS::GetActiveScreen() {
   return ash::Shell::GetScreen();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions