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

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

Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetrayupdate
Patch Set: rebase Created 4 years, 6 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/browser/ui/ash/chrome_shell_delegate.h » ('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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 123 }
124 124
125 bool TestShellDelegate::IsMultiProfilesEnabled() const { 125 bool TestShellDelegate::IsMultiProfilesEnabled() const {
126 return multi_profiles_enabled_; 126 return multi_profiles_enabled_;
127 } 127 }
128 128
129 bool TestShellDelegate::IsRunningInForcedAppMode() const { 129 bool TestShellDelegate::IsRunningInForcedAppMode() const {
130 return false; 130 return false;
131 } 131 }
132 132
133 bool TestShellDelegate::CanShowWindowForUser(aura::Window* window) const { 133 bool TestShellDelegate::CanShowWindowForUser(WmWindow* window) const {
134 return true; 134 return true;
135 } 135 }
136 136
137 bool TestShellDelegate::IsForceMaximizeOnFirstRun() const { 137 bool TestShellDelegate::IsForceMaximizeOnFirstRun() const {
138 return force_maximize_on_first_run_; 138 return force_maximize_on_first_run_;
139 } 139 }
140 140
141 void TestShellDelegate::PreInit() { 141 void TestShellDelegate::PreInit() {
142 } 142 }
143 143
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 #if defined(OS_CHROMEOS) 238 #if defined(OS_CHROMEOS)
239 Shell* shell = Shell::GetInstance(); 239 Shell* shell = Shell::GetInstance();
240 static_cast<MediaDelegateImpl*>(shell->media_delegate()) 240 static_cast<MediaDelegateImpl*>(shell->media_delegate())
241 ->set_media_capture_state(state); 241 ->set_media_capture_state(state);
242 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); 242 shell->system_tray_notifier()->NotifyMediaCaptureChanged();
243 #endif 243 #endif
244 } 244 }
245 245
246 } // namespace test 246 } // namespace test
247 } // namespace ash 247 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698