| 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/content/client/shell_browser_main_parts.h" | 5 #include "ash/shell/content/client/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/content/shell_content_state.h" | 8 #include "ash/content/shell_content_state.h" |
| 9 #include "ash/desktop_background/desktop_background_controller.h" | 9 #include "ash/desktop_background/desktop_background_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "ui/aura/window.h" | 30 #include "ui/aura/window.h" |
| 31 #include "ui/aura/window_tree_host.h" | 31 #include "ui/aura/window_tree_host.h" |
| 32 #include "ui/base/ui_base_paths.h" | 32 #include "ui/base/ui_base_paths.h" |
| 33 #include "ui/compositor/compositor.h" | 33 #include "ui/compositor/compositor.h" |
| 34 #include "ui/gfx/screen.h" | 34 #include "ui/gfx/screen.h" |
| 35 #include "ui/message_center/message_center.h" | 35 #include "ui/message_center/message_center.h" |
| 36 #include "ui/views/test/test_views_delegate.h" | 36 #include "ui/views/test/test_views_delegate.h" |
| 37 #include "ui/wm/core/wm_state.h" | 37 #include "ui/wm/core/wm_state.h" |
| 38 | 38 |
| 39 #if defined(USE_X11) | 39 #if defined(USE_X11) |
| 40 #include "ui/events/devices/x11/touch_factory_x11.h" | 40 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
| 44 #include "chromeos/audio/cras_audio_handler.h" | 44 #include "chromeos/audio/cras_audio_handler.h" |
| 45 #include "chromeos/dbus/dbus_thread_manager.h" | 45 #include "chromeos/dbus/dbus_thread_manager.h" |
| 46 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 46 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 namespace ash { | 49 namespace ash { |
| 50 namespace shell { | 50 namespace shell { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 browser_context_.reset(); | 168 browser_context_.reset(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 172 base::MessageLoop::current()->Run(); | 172 base::MessageLoop::current()->Run(); |
| 173 return true; | 173 return true; |
| 174 } | 174 } |
| 175 | 175 |
| 176 } // namespace shell | 176 } // namespace shell |
| 177 } // namespace ash | 177 } // namespace ash |
| OLD | NEW |