Chromium Code Reviews| 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" |
| 11 #include "ash/common/palette_delegate.h" | 11 #include "ash/common/palette_delegate.h" |
| 12 #include "ash/common/session/session_state_delegate.h" | 12 #include "ash/common/session/session_state_delegate.h" |
| 13 #include "ash/common/wm_shell.h" | 13 #include "ash/common/wm_shell.h" |
| 14 #include "ash/mus/accessibility_delegate_mus.h" | 14 #include "ash/mus/accessibility_delegate_mus.h" |
| 15 #include "ash/mus/context_menu_mus.h" | 15 #include "ash/mus/context_menu_mus.h" |
| 16 #include "ash/mus/shelf_delegate_mus.h" | 16 #include "ash/mus/shelf_delegate_mus.h" |
| 17 #include "ash/mus/wallpaper_delegate_mus.h" | 17 #include "ash/mus/wallpaper_delegate_mus.h" |
| 18 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
| 19 #include "base/strings/string16.h" | 19 #include "base/strings/string16.h" |
| 20 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
| 21 #include "components/user_manager/user_info_impl.h" | 21 #include "components/user_manager/user_info_impl.h" |
| 22 #include "ui/app_list/presenter/app_list_presenter.h" | 22 #include "ui/app_list/presenter/app_list_presenter.h" |
|
James Cook
2016/12/10 00:50:08
not needed?
msw
2016/12/10 01:08:12
Done.
| |
| 23 #include "ui/gfx/image/image.h" | 23 #include "ui/gfx/image/image.h" |
| 24 | 24 |
| 25 #if defined(OS_CHROMEOS) | 25 #if defined(OS_CHROMEOS) |
| 26 #include "ash/mus/system_tray_delegate_mus.h" | 26 #include "ash/mus/system_tray_delegate_mus.h" |
| 27 #else | 27 #else |
| 28 #include "ash/common/system/tray/default_system_tray_delegate.h" | 28 #include "ash/common/system/tray/default_system_tray_delegate.h" |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 namespace ash { | 31 namespace ash { |
| 32 namespace { | 32 namespace { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 return MEDIA_CAPTURE_NONE; | 103 return MEDIA_CAPTURE_NONE; |
| 104 } | 104 } |
| 105 | 105 |
| 106 private: | 106 private: |
| 107 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); | 107 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 } // namespace | 110 } // namespace |
| 111 | 111 |
| 112 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector) | 112 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector) |
| 113 : connector_(connector), app_list_presenter_(connector) { | 113 : connector_(connector) { |
| 114 // |connector_| may be null in tests. | 114 // |connector_| may be null in tests. |
| 115 } | 115 } |
| 116 | 116 |
| 117 ShellDelegateMus::~ShellDelegateMus() {} | 117 ShellDelegateMus::~ShellDelegateMus() {} |
| 118 | 118 |
| 119 service_manager::Connector* ShellDelegateMus::GetShellConnector() const { | 119 service_manager::Connector* ShellDelegateMus::GetShellConnector() const { |
| 120 return connector_; | 120 return connector_; |
| 121 } | 121 } |
| 122 | 122 |
| 123 bool ShellDelegateMus::IsIncognitoAllowed() const { | 123 bool ShellDelegateMus::IsIncognitoAllowed() const { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled, | 239 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled, |
| 240 bool use_local_state) { | 240 bool use_local_state) { |
| 241 NOTIMPLEMENTED(); | 241 NOTIMPLEMENTED(); |
| 242 } | 242 } |
| 243 | 243 |
| 244 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() { | 244 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() { |
| 245 NOTIMPLEMENTED(); | 245 NOTIMPLEMENTED(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 } // namespace ash | 248 } // namespace ash |
| OLD | NEW |