Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/default_accessibility_delegate.h" | 8 #include "ash/default_accessibility_delegate.h" |
| 9 #include "ash/default_user_wallpaper_delegate.h" | 9 #include "ash/default_user_wallpaper_delegate.h" |
| 10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 } | 174 } |
| 175 | 175 |
| 176 bool ShellDelegateImpl::IsRunningInForcedAppMode() const { | 176 bool ShellDelegateImpl::IsRunningInForcedAppMode() const { |
| 177 return false; | 177 return false; |
| 178 } | 178 } |
| 179 | 179 |
| 180 bool ShellDelegateImpl::IsMultiAccountEnabled() const { | 180 bool ShellDelegateImpl::IsMultiAccountEnabled() const { |
| 181 return false; | 181 return false; |
| 182 } | 182 } |
| 183 | 183 |
| 184 bool ShellDelegateImpl::ForceMaximizeOnFirstRun() const { | |
|
bartfab (slow)
2015/04/02 08:44:28
You have a merge error here. The method appears th
peletskyi
2015/04/02 12:53:29
Done.
| |
| 185 return false; | |
| 186 } | |
| 187 | |
| 188 bool ShellDelegateImpl::ForceMaximizeOnFirstRun() const { | |
| 189 return false; | |
| 190 } | |
| 191 | |
| 192 bool ShellDelegateImpl::ForceMaximizeOnFirstRun() const { | |
| 193 return false; | |
| 194 } | |
| 195 | |
| 184 void ShellDelegateImpl::PreInit() { | 196 void ShellDelegateImpl::PreInit() { |
| 185 } | 197 } |
| 186 | 198 |
| 187 void ShellDelegateImpl::PreShutdown() { | 199 void ShellDelegateImpl::PreShutdown() { |
| 188 } | 200 } |
| 189 | 201 |
| 190 void ShellDelegateImpl::Exit() { | 202 void ShellDelegateImpl::Exit() { |
| 191 base::MessageLoopForUI::current()->Quit(); | 203 base::MessageLoopForUI::current()->Quit(); |
| 192 } | 204 } |
| 193 | 205 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 257 // Real GPU support depends on src/content, so just use a stub. | 269 // Real GPU support depends on src/content, so just use a stub. |
| 258 return new GPUSupportStub; | 270 return new GPUSupportStub; |
| 259 } | 271 } |
| 260 | 272 |
| 261 base::string16 ShellDelegateImpl::GetProductName() const { | 273 base::string16 ShellDelegateImpl::GetProductName() const { |
| 262 return base::string16(); | 274 return base::string16(); |
| 263 } | 275 } |
| 264 | 276 |
| 265 } // namespace shell | 277 } // namespace shell |
| 266 } // namespace ash | 278 } // namespace ash |
| OLD | NEW |