Index: chrome/browser/ui/views/frame/immersive_mode_controller_factory.cc |
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_factory.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_factory.cc |
index ad89c60553b823994f018526b81baa63397c81ea..bf41ff28035cd6722fa92eb3b95e8b084e7b6b8a 100644 |
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_factory.cc |
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_factory.cc |
@@ -3,21 +3,12 @@ |
// found in the LICENSE file. |
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
- |
-#include "chrome/browser/ui/views/frame/immersive_mode_controller_stub.h" |
- |
-#if defined(OS_CHROMEOS) |
#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" |
-#endif // defined(OS_CHROMEOS) |
namespace chrome { |
ImmersiveModeController* CreateImmersiveModeController() { |
-#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
|
return new ImmersiveModeControllerAsh(); |
-#else |
- return new ImmersiveModeControllerStub(); |
-#endif |
} |
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
|
} // namespace chrome |