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 "ash/default_accessibility_delegate.h" | 7 #include "ash/default_accessibility_delegate.h" |
| 8 #include "ash/default_user_wallpaper_delegate.h" | 8 #include "ash/default_user_wallpaper_delegate.h" |
| 9 #include "ash/gpu_support_stub.h" | 9 #include "ash/gpu_support_stub.h" |
| 10 #include "ash/media_delegate.h" | 10 #include "ash/media_delegate.h" |
| 11 #include "ash/mus/context_menu_mus.h" | 11 #include "ash/mus/context_menu_mus.h" |
| 12 #include "ash/mus/shelf_delegate_mus.h" | 12 #include "ash/mus/shelf_delegate_mus.h" |
| 13 #include "ash/session/session_state_delegate.h" | 13 #include "ash/session/session_state_delegate.h" |
| 14 #include "ash/system/tray/default_system_tray_delegate.h" | 14 #include "ash/system/tray/default_system_tray_delegate.h" |
| 15 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
| 16 #include "components/user_manager/user_info_impl.h" | 16 #include "components/user_manager/user_info_impl.h" |
| 17 #include "ui/app_list/shower/app_list_shower.h" | |
| 17 #include "ui/gfx/image/image.h" | 18 #include "ui/gfx/image/image.h" |
| 18 | 19 |
| 19 namespace ash { | 20 namespace ash { |
| 20 namespace sysui { | 21 namespace sysui { |
| 21 | 22 |
| 22 namespace { | 23 namespace { |
| 23 | 24 |
| 24 class SessionStateDelegateStub : public SessionStateDelegate { | 25 class SessionStateDelegateStub : public SessionStateDelegate { |
| 25 public: | 26 public: |
| 26 SessionStateDelegateStub() | 27 SessionStateDelegateStub() |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); } | 87 void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); } |
| 87 MediaCaptureState GetMediaCaptureState(UserIndex index) override { | 88 MediaCaptureState GetMediaCaptureState(UserIndex index) override { |
| 88 NOTIMPLEMENTED(); | 89 NOTIMPLEMENTED(); |
| 89 return MEDIA_CAPTURE_NONE; | 90 return MEDIA_CAPTURE_NONE; |
| 90 } | 91 } |
| 91 | 92 |
| 92 private: | 93 private: |
| 93 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); | 94 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); |
| 94 }; | 95 }; |
| 95 | 96 |
| 97 class AppListShowerStub : public app_list::AppListShower { | |
|
msw
2016/04/11 17:07:43
nit: AppListShowerMus? It's readily discernable th
James Cook
2016/04/11 17:13:39
Done.
| |
| 98 public: | |
| 99 AppListShowerStub() {} | |
| 100 ~AppListShowerStub() override {} | |
| 101 | |
| 102 // app_list::AppListShower: | |
| 103 void Show(aura::Window* window) override { NOTIMPLEMENTED(); } | |
| 104 void Dismiss() override { NOTIMPLEMENTED(); } | |
| 105 bool IsVisible() const override { | |
| 106 NOTIMPLEMENTED(); | |
| 107 return false; | |
| 108 } | |
| 109 bool GetTargetVisibility() const override { | |
| 110 NOTIMPLEMENTED(); | |
| 111 return false; | |
| 112 } | |
| 113 | |
| 114 private: | |
| 115 DISALLOW_COPY_AND_ASSIGN(AppListShowerStub); | |
| 116 }; | |
| 117 | |
| 96 } // namespace | 118 } // namespace |
| 97 | 119 |
| 98 ShellDelegateMus::ShellDelegateMus() {} | 120 ShellDelegateMus::ShellDelegateMus() |
| 121 : app_list_shower_(new AppListShowerStub) {} | |
| 99 | 122 |
| 100 ShellDelegateMus::~ShellDelegateMus() {} | 123 ShellDelegateMus::~ShellDelegateMus() {} |
| 101 | 124 |
| 102 bool ShellDelegateMus::IsFirstRunAfterBoot() const { | 125 bool ShellDelegateMus::IsFirstRunAfterBoot() const { |
| 103 NOTIMPLEMENTED(); | 126 NOTIMPLEMENTED(); |
| 104 return false; | 127 return false; |
| 105 } | 128 } |
| 106 | 129 |
| 107 bool ShellDelegateMus::IsIncognitoAllowed() const { | 130 bool ShellDelegateMus::IsIncognitoAllowed() const { |
| 108 NOTIMPLEMENTED(); | 131 NOTIMPLEMENTED(); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 void ShellDelegateMus::RemoveVirtualKeyboardStateObserver( | 181 void ShellDelegateMus::RemoveVirtualKeyboardStateObserver( |
| 159 VirtualKeyboardStateObserver* observer) { | 182 VirtualKeyboardStateObserver* observer) { |
| 160 NOTIMPLEMENTED(); | 183 NOTIMPLEMENTED(); |
| 161 } | 184 } |
| 162 | 185 |
| 163 void ShellDelegateMus::OpenUrl(const GURL& url) { | 186 void ShellDelegateMus::OpenUrl(const GURL& url) { |
| 164 NOTIMPLEMENTED(); | 187 NOTIMPLEMENTED(); |
| 165 } | 188 } |
| 166 | 189 |
| 167 app_list::AppListShower* ShellDelegateMus::GetAppListShower() { | 190 app_list::AppListShower* ShellDelegateMus::GetAppListShower() { |
| 168 NOTIMPLEMENTED(); | 191 // Individual methods are marked NOTIMPLEMENTED. |
|
msw
2016/04/11 17:07:43
nit: eh, comment not worthwhile?
James Cook
2016/04/11 17:13:39
Done.
| |
| 169 return nullptr; | 192 return app_list_shower_.get(); |
| 170 } | 193 } |
| 171 | 194 |
| 172 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { | 195 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { |
| 173 return new ShelfDelegateMus(model); | 196 return new ShelfDelegateMus(model); |
| 174 } | 197 } |
| 175 | 198 |
| 176 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { | 199 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { |
| 177 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; | 200 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; |
| 178 return new DefaultSystemTrayDelegate; | 201 return new DefaultSystemTrayDelegate; |
| 179 } | 202 } |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 218 return base::string16(); | 241 return base::string16(); |
| 219 } | 242 } |
| 220 | 243 |
| 221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 244 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 222 NOTIMPLEMENTED(); | 245 NOTIMPLEMENTED(); |
| 223 return gfx::Image(); | 246 return gfx::Image(); |
| 224 } | 247 } |
| 225 | 248 |
| 226 } // namespace sysui | 249 } // namespace sysui |
| 227 } // namespace ash | 250 } // namespace ash |
| OLD | NEW |