| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "build/build_config.h" |
| 9 #include "extensions/browser/api/system_display/display_info_provider.h" | 10 #include "extensions/browser/api/system_display/display_info_provider.h" |
| 10 #include "extensions/common/api/system_display.h" | 11 #include "extensions/common/api/system_display.h" |
| 11 | 12 |
| 12 #if defined(OS_CHROMEOS) | 13 #if defined(OS_CHROMEOS) |
| 13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 14 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" | 15 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" |
| 15 #include "ui/gfx/screen.h" | 16 #include "ui/gfx/screen.h" |
| 16 #endif | 17 #endif |
| 17 | 18 |
| 18 namespace extensions { | 19 namespace extensions { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 return false; | 58 return false; |
| 58 #else | 59 #else |
| 59 scoped_ptr<api::system_display::EnableUnifiedDesktop::Params> params( | 60 scoped_ptr<api::system_display::EnableUnifiedDesktop::Params> params( |
| 60 api::system_display::EnableUnifiedDesktop::Params::Create(*args_)); | 61 api::system_display::EnableUnifiedDesktop::Params::Create(*args_)); |
| 61 DisplayInfoProvider::Get()->EnableUnifiedDesktop(params->enabled); | 62 DisplayInfoProvider::Get()->EnableUnifiedDesktop(params->enabled); |
| 62 return true; | 63 return true; |
| 63 #endif | 64 #endif |
| 64 } | 65 } |
| 65 | 66 |
| 66 } // namespace extensions | 67 } // namespace extensions |
| OLD | NEW |