Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1115)

Side by Side Diff: ash/mus/shell_delegate_mus.cc

Issue 2567523002: mash: Have chrome set itself as the app list presenter. (Closed)
Patch Set: Address comments. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
23 #include "ui/gfx/image/image.h" 22 #include "ui/gfx/image/image.h"
24 23
25 #if defined(OS_CHROMEOS) 24 #if defined(OS_CHROMEOS)
26 #include "ash/mus/system_tray_delegate_mus.h" 25 #include "ash/mus/system_tray_delegate_mus.h"
27 #else 26 #else
28 #include "ash/common/system/tray/default_system_tray_delegate.h" 27 #include "ash/common/system/tray/default_system_tray_delegate.h"
29 #endif 28 #endif
30 29
31 namespace ash { 30 namespace ash {
32 namespace { 31 namespace {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 return MEDIA_CAPTURE_NONE; 102 return MEDIA_CAPTURE_NONE;
104 } 103 }
105 104
106 private: 105 private:
107 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); 106 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
108 }; 107 };
109 108
110 } // namespace 109 } // namespace
111 110
112 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector) 111 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector)
113 : connector_(connector), app_list_presenter_(connector) { 112 : connector_(connector) {
114 // |connector_| may be null in tests. 113 // |connector_| may be null in tests.
115 } 114 }
116 115
117 ShellDelegateMus::~ShellDelegateMus() {} 116 ShellDelegateMus::~ShellDelegateMus() {}
118 117
119 service_manager::Connector* ShellDelegateMus::GetShellConnector() const { 118 service_manager::Connector* ShellDelegateMus::GetShellConnector() const {
120 return connector_; 119 return connector_;
121 } 120 }
122 121
123 bool ShellDelegateMus::IsIncognitoAllowed() const { 122 bool ShellDelegateMus::IsIncognitoAllowed() const {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled, 238 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled,
240 bool use_local_state) { 239 bool use_local_state) {
241 NOTIMPLEMENTED(); 240 NOTIMPLEMENTED();
242 } 241 }
243 242
244 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() { 243 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() {
245 NOTIMPLEMENTED(); 244 NOTIMPLEMENTED();
246 } 245 }
247 246
248 } // namespace ash 247 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698