| OLD | NEW |
| 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 "extensions/browser/api/system_display/system_display_api.h" | 5 #include "extensions/browser/api/system_display/system_display_api.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "extensions/browser/api/system_display/display_info_provider.h" | 11 #include "extensions/browser/api/system_display/display_info_provider.h" |
| 12 #include "extensions/common/api/system_display.h" | 12 #include "extensions/common/api/system_display.h" |
| 13 | 13 |
| 14 #if defined(OS_CHROMEOS) | 14 #if defined(OS_CHROMEOS) |
| 15 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" | 15 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" |
| 16 #include "ui/gfx/screen.h" | |
| 17 #endif | 16 #endif |
| 18 | 17 |
| 19 namespace extensions { | 18 namespace extensions { |
| 20 | 19 |
| 21 using api::system_display::DisplayUnitInfo; | 20 using api::system_display::DisplayUnitInfo; |
| 22 | 21 |
| 23 namespace SetDisplayProperties = api::system_display::SetDisplayProperties; | 22 namespace SetDisplayProperties = api::system_display::SetDisplayProperties; |
| 24 | 23 |
| 25 bool SystemDisplayGetInfoFunction::RunSync() { | 24 bool SystemDisplayGetInfoFunction::RunSync() { |
| 26 DisplayUnitInfoList all_displays_info = | 25 DisplayUnitInfoList all_displays_info = |
| (...skipping 28 matching lines...) Expand all Loading... |
| 55 return false; | 54 return false; |
| 56 #else | 55 #else |
| 57 std::unique_ptr<api::system_display::EnableUnifiedDesktop::Params> params( | 56 std::unique_ptr<api::system_display::EnableUnifiedDesktop::Params> params( |
| 58 api::system_display::EnableUnifiedDesktop::Params::Create(*args_)); | 57 api::system_display::EnableUnifiedDesktop::Params::Create(*args_)); |
| 59 DisplayInfoProvider::Get()->EnableUnifiedDesktop(params->enabled); | 58 DisplayInfoProvider::Get()->EnableUnifiedDesktop(params->enabled); |
| 60 return true; | 59 return true; |
| 61 #endif | 60 #endif |
| 62 } | 61 } |
| 63 | 62 |
| 64 } // namespace extensions | 63 } // namespace extensions |
| OLD | NEW |