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 "ash/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
6 | 6 |
7 #include "ash/app_list/app_list_presenter_delegate_factory.h" | 7 #include "ash/app_list/app_list_presenter_delegate_factory.h" |
8 #include "ash/common/accessibility_delegate.h" | 8 #include "ash/common/accessibility_delegate.h" |
9 #include "ash/common/default_accessibility_delegate.h" | 9 #include "ash/common/default_accessibility_delegate.h" |
10 #include "ash/common/gpu_support_stub.h" | 10 #include "ash/common/gpu_support_stub.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
75 MediaCaptureState GetMediaCaptureState(UserIndex index) override { | 75 MediaCaptureState GetMediaCaptureState(UserIndex index) override { |
76 return MEDIA_CAPTURE_VIDEO; | 76 return MEDIA_CAPTURE_VIDEO; |
77 } | 77 } |
78 | 78 |
79 private: | 79 private: |
80 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); | 80 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); |
81 }; | 81 }; |
82 | 82 |
83 class PaletteDelegateImpl : public PaletteDelegate { | 83 class PaletteDelegateImpl : public PaletteDelegate { |
84 public: | 84 public: |
85 PaletteDelegateImpl() {}; | 85 PaletteDelegateImpl() {} |
86 ~PaletteDelegateImpl() override {}; | 86 ~PaletteDelegateImpl() override {} |
87 | |
88 // PaletteDelegate: | |
89 std::unique_ptr<EnableListenerSubscription> AddPaletteEnableListener( | |
90 const EnableListener& on_state_changed) override { | |
91 on_state_changed.Run(false); | |
92 return std::unique_ptr<EnableListenerSubscription>(); | |
stevenjb
2016/08/23 17:36:41
return nullptr?
jdufault
2016/08/23 22:49:56
Done.
| |
93 } | |
87 | 94 |
88 private: | 95 private: |
89 DISALLOW_COPY_AND_ASSIGN(PaletteDelegateImpl); | 96 DISALLOW_COPY_AND_ASSIGN(PaletteDelegateImpl); |
90 }; | 97 }; |
91 | 98 |
92 class SessionStateDelegateImpl : public SessionStateDelegate { | 99 class SessionStateDelegateImpl : public SessionStateDelegate { |
93 public: | 100 public: |
94 SessionStateDelegateImpl() | 101 SessionStateDelegateImpl() |
95 : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {} | 102 : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {} |
96 | 103 |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
275 base::string16 ShellDelegateImpl::GetProductName() const { | 282 base::string16 ShellDelegateImpl::GetProductName() const { |
276 return base::string16(); | 283 return base::string16(); |
277 } | 284 } |
278 | 285 |
279 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { | 286 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
280 return gfx::Image(); | 287 return gfx::Image(); |
281 } | 288 } |
282 | 289 |
283 } // namespace shell | 290 } // namespace shell |
284 } // namespace ash | 291 } // namespace ash |
OLD | NEW |