| 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/debug/leak_annotations.h" | 9 #include "base/debug/leak_annotations.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 bool SetInfo(const std::string& display_id, | 81 bool SetInfo(const std::string& display_id, |
| 82 const api::system_display::DisplayProperties& params, | 82 const api::system_display::DisplayProperties& params, |
| 83 std::string* error) override { | 83 std::string* error) override { |
| 84 // Should get called only once per test case. | 84 // Should get called only once per test case. |
| 85 EXPECT_FALSE(set_info_value_); | 85 EXPECT_FALSE(set_info_value_); |
| 86 set_info_value_ = params.ToValue(); | 86 set_info_value_ = params.ToValue(); |
| 87 set_info_display_id_ = display_id; | 87 set_info_display_id_ = display_id; |
| 88 return true; | 88 return true; |
| 89 } | 89 } |
| 90 | 90 |
| 91 gfx::Screen* GetActiveScreen() override { return NULL; } | |
| 92 | |
| 93 void EnableUnifiedDesktop(bool enable) override { | 91 void EnableUnifiedDesktop(bool enable) override { |
| 94 unified_desktop_enabled_ = enable; | 92 unified_desktop_enabled_ = enable; |
| 95 } | 93 } |
| 96 | 94 |
| 97 scoped_ptr<base::DictionaryValue> GetSetInfoValue() { | 95 scoped_ptr<base::DictionaryValue> GetSetInfoValue() { |
| 98 return std::move(set_info_value_); | 96 return std::move(set_info_value_); |
| 99 } | 97 } |
| 100 | 98 |
| 101 std::string GetSetInfoDisplayId() const { return set_info_display_id_; } | 99 std::string GetSetInfoDisplayId() const { return set_info_display_id_; } |
| 102 | 100 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 enable_unified_function->set_extension(test_extension.get()); | 293 enable_unified_function->set_extension(test_extension.get()); |
| 296 ASSERT_TRUE(api_test_utils::RunFunction(enable_unified_function.get(), | 294 ASSERT_TRUE(api_test_utils::RunFunction(enable_unified_function.get(), |
| 297 "[false]", browser_context())); | 295 "[false]", browser_context())); |
| 298 EXPECT_FALSE(provider_->unified_desktop_enabled()); | 296 EXPECT_FALSE(provider_->unified_desktop_enabled()); |
| 299 } | 297 } |
| 300 } | 298 } |
| 301 | 299 |
| 302 #endif // defined(OS_CHROMEOS) | 300 #endif // defined(OS_CHROMEOS) |
| 303 | 301 |
| 304 } // namespace extensions | 302 } // namespace extensions |
| OLD | NEW |