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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: rebase again Created 4 years, 2 months 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
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/app/mojo/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/app_list/app_list_presenter_delegate.h" 9 #include "ash/app_list/app_list_presenter_delegate.h"
10 #include "ash/app_list/app_list_presenter_delegate_factory.h" 10 #include "ash/app_list/app_list_presenter_delegate_factory.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 TestShellDelegate::TestShellDelegate() 106 TestShellDelegate::TestShellDelegate()
107 : num_exit_requests_(0), 107 : num_exit_requests_(0),
108 multi_profiles_enabled_(false), 108 multi_profiles_enabled_(false),
109 force_maximize_on_first_run_(false), 109 force_maximize_on_first_run_(false),
110 app_list_presenter_delegate_factory_(new AppListPresenterDelegateFactory( 110 app_list_presenter_delegate_factory_(new AppListPresenterDelegateFactory(
111 base::WrapUnique(new AppListViewDelegateFactoryImpl))) {} 111 base::WrapUnique(new AppListViewDelegateFactoryImpl))) {}
112 112
113 TestShellDelegate::~TestShellDelegate() {} 113 TestShellDelegate::~TestShellDelegate() {}
114 114
115 ::shell::Connector* TestShellDelegate::GetShellConnector() const {
116 return nullptr;
117 }
118
115 bool TestShellDelegate::IsFirstRunAfterBoot() const { 119 bool TestShellDelegate::IsFirstRunAfterBoot() const {
116 return false; 120 return false;
117 } 121 }
118 122
119 bool TestShellDelegate::IsIncognitoAllowed() const { 123 bool TestShellDelegate::IsIncognitoAllowed() const {
120 return true; 124 return true;
121 } 125 }
122 126
123 bool TestShellDelegate::IsMultiProfilesEnabled() const { 127 bool TestShellDelegate::IsMultiProfilesEnabled() const {
124 return multi_profiles_enabled_; 128 return multi_profiles_enabled_;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { 216 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
213 #if defined(OS_CHROMEOS) 217 #if defined(OS_CHROMEOS)
214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) 218 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate())
215 ->set_media_capture_state(state); 219 ->set_media_capture_state(state);
216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); 220 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged();
217 #endif 221 #endif
218 } 222 }
219 223
220 } // namespace test 224 } // namespace test
221 } // namespace ash 225 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/app/mojo/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698