| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/mojo/init/ui_init.h" | 5 #include "ui/mojo/init/ui_init.h" |
| 6 | 6 |
| 7 #include "base/macros.h" |
| 7 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 9 #include "build/build_config.h" |
| 8 #include "ui/mojo/init/screen_mojo.h" | 10 #include "ui/mojo/init/screen_mojo.h" |
| 9 | 11 |
| 10 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) |
| 11 #include "ui/events/gesture_detection/gesture_configuration.h" // nogncheck | 13 #include "ui/events/gesture_detection/gesture_configuration.h" // nogncheck |
| 12 #endif | 14 #endif |
| 13 | 15 |
| 14 namespace ui { | 16 namespace ui { |
| 15 namespace mojo { | 17 namespace mojo { |
| 16 | 18 |
| 17 #if defined(OS_ANDROID) | 19 #if defined(OS_ANDROID) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 52 |
| 51 UIInit::~UIInit() { | 53 UIInit::~UIInit() { |
| 52 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr); | 54 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr); |
| 53 #if defined(OS_ANDROID) | 55 #if defined(OS_ANDROID) |
| 54 ui::GestureConfiguration::SetInstance(nullptr); | 56 ui::GestureConfiguration::SetInstance(nullptr); |
| 55 #endif | 57 #endif |
| 56 } | 58 } |
| 57 | 59 |
| 58 } // namespace mojo | 60 } // namespace mojo |
| 59 } // namespace ui | 61 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1550483002:
Switch to standard integer types in ui/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@int-ui-events