Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(960)

Side by Side Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "content/shell/browser/shell_browser_main_parts.h" 5 #include "content/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 17 matching lines...) Expand all
28 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
29 #include "url/gurl.h" 29 #include "url/gurl.h"
30 30
31 #if defined(OS_ANDROID) 31 #if defined(OS_ANDROID)
32 #include "components/crash/browser/crash_dump_manager_android.h" 32 #include "components/crash/browser/crash_dump_manager_android.h"
33 #include "net/android/network_change_notifier_factory_android.h" 33 #include "net/android/network_change_notifier_factory_android.h"
34 #include "net/base/network_change_notifier.h" 34 #include "net/base/network_change_notifier.h"
35 #endif 35 #endif
36 36
37 #if defined(USE_AURA) && defined(USE_X11) 37 #if defined(USE_AURA) && defined(USE_X11)
38 #include "ui/events/x/touch_factory_x11.h" 38 #include "ui/events/devices/x11/touch_factory_x11.h"
39 #endif 39 #endif
40 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 40 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
41 #include "ui/base/ime/input_method_initializer.h" 41 #include "ui/base/ime/input_method_initializer.h"
42 #endif 42 #endif
43 43
44 namespace content { 44 namespace content {
45 45
46 namespace { 46 namespace {
47 47
48 GURL GetStartupURL() { 48 GURL GetStartupURL() {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } 155 }
156 156
157 void ShellBrowserMainParts::PostMainMessageLoopRun() { 157 void ShellBrowserMainParts::PostMainMessageLoopRun() {
158 if (devtools_delegate_) 158 if (devtools_delegate_)
159 devtools_delegate_->Stop(); 159 devtools_delegate_->Stop();
160 browser_context_.reset(); 160 browser_context_.reset();
161 off_the_record_browser_context_.reset(); 161 off_the_record_browser_context_.reset();
162 } 162 }
163 163
164 } // namespace 164 } // namespace
OLDNEW
« no previous file with comments | « content/shell/browser/layout_test/layout_test_browser_main_parts.cc ('k') | ui/aura/window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698