| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/shell_delegate_mus.h" | 5 #include "ash/mus/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/gpu_support_stub.h" | 9 #include "ash/common/gpu_support_stub.h" |
| 10 #include "ash/common/media_delegate.h" | 10 #include "ash/common/media_delegate.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 NOTIMPLEMENTED(); | 101 NOTIMPLEMENTED(); |
| 102 return MEDIA_CAPTURE_NONE; | 102 return MEDIA_CAPTURE_NONE; |
| 103 } | 103 } |
| 104 | 104 |
| 105 private: | 105 private: |
| 106 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); | 106 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 } // namespace | 109 } // namespace |
| 110 | 110 |
| 111 ShellDelegateMus::ShellDelegateMus(shell::Connector* connector) | 111 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector) |
| 112 : connector_(connector), app_list_presenter_(connector) { | 112 : connector_(connector), app_list_presenter_(connector) { |
| 113 // |connector_| may be null in tests. | 113 // |connector_| may be null in tests. |
| 114 } | 114 } |
| 115 | 115 |
| 116 ShellDelegateMus::~ShellDelegateMus() {} | 116 ShellDelegateMus::~ShellDelegateMus() {} |
| 117 | 117 |
| 118 ::shell::Connector* ShellDelegateMus::GetShellConnector() const { | 118 service_manager::Connector* ShellDelegateMus::GetShellConnector() const { |
| 119 return connector_; | 119 return connector_; |
| 120 } | 120 } |
| 121 | 121 |
| 122 bool ShellDelegateMus::IsFirstRunAfterBoot() const { | 122 bool ShellDelegateMus::IsFirstRunAfterBoot() const { |
| 123 NOTIMPLEMENTED(); | 123 NOTIMPLEMENTED(); |
| 124 return false; | 124 return false; |
| 125 } | 125 } |
| 126 | 126 |
| 127 bool ShellDelegateMus::IsIncognitoAllowed() const { | 127 bool ShellDelegateMus::IsIncognitoAllowed() const { |
| 128 NOTIMPLEMENTED(); | 128 NOTIMPLEMENTED(); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 NOTIMPLEMENTED(); | 233 NOTIMPLEMENTED(); |
| 234 return base::string16(); | 234 return base::string16(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 238 NOTIMPLEMENTED(); | 238 NOTIMPLEMENTED(); |
| 239 return gfx::Image(); | 239 return gfx::Image(); |
| 240 } | 240 } |
| 241 | 241 |
| 242 } // namespace ash | 242 } // namespace ash |
| OLD | NEW |