| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h" | 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h" |
| 6 | 6 |
| 7 #if defined(USE_ASH) | 7 #if defined(USE_ASH) |
| 8 #include "chrome/browser/ui/ash/ash_util.h" | |
| 9 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" | 8 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
| 10 #endif | 9 #endif |
| 11 | 10 |
| 12 namespace chrome { | 11 namespace chrome { |
| 13 | 12 |
| 14 ImmersiveModeController* CreateImmersiveModeController() { | 13 ImmersiveModeController* CreateImmersiveModeController() { |
| 15 #if defined(USE_ASH) | 14 #if defined(USE_ASH) |
| 16 if (!IsRunningInMash()) | 15 return new ImmersiveModeControllerAsh(); |
| 17 return new ImmersiveModeControllerAsh(); | 16 #else |
| 18 | 17 return new ImmersiveModeControllerStub(); |
| 19 // TODO: http://crbug.com/548435 | |
| 20 NOTIMPLEMENTED(); | |
| 21 #endif // USE_ASH | 18 #endif // USE_ASH |
| 22 return new ImmersiveModeControllerStub(); | |
| 23 } | 19 } |
| 24 | 20 |
| 25 } // namespace chrome | 21 } // namespace chrome |
| OLD | NEW |