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.h" | 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
6 | |
7 #include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h" | |
8 | |
9 #if defined(OS_CHROMEOS) | |
10 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" | 6 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
11 #endif // defined(OS_CHROMEOS) | |
12 | 7 |
13 namespace chrome { | 8 namespace chrome { |
14 | 9 |
15 ImmersiveModeController* CreateImmersiveModeController() { | 10 ImmersiveModeController* CreateImmersiveModeController() { |
16 #if defined(OS_CHROMEOS) | |
pkotwicz
2014/03/13 16:48:19
The new ifdef should be:
#if defined(USE_ASH)
Lin
zturner
2014/03/13 16:54:06
I assume the same applies everywhere that there us
pkotwicz
2014/03/13 18:08:45
That is correct. You can remove the ifdef complete
| |
17 return new ImmersiveModeControllerAsh(); | 11 return new ImmersiveModeControllerAsh(); |
18 #else | |
19 return new ImmersiveModeControllerStub(); | |
20 #endif | |
21 } | 12 } |
pkotwicz
2014/03/13 16:48:19
Can you reenable immersive_mode_controller_ash_uni
zturner
2014/03/13 16:54:06
Thanks, I missed these.
zturner
2014/03/13 17:56:39
All of these tests are broken because of this:
ht
| |
22 | 13 |
23 } // namespace chrome | 14 } // namespace chrome |
OLD | NEW |