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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator.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
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/ui/startup/startup_browser_creator.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 #include <set> 8 #include <set>
9 9
10 #include "apps/app_load_service.h" 10 #include "apps/app_load_service.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 74 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
75 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 75 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
76 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 76 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
77 #include "chrome/browser/chromeos/profiles/profile_helper.h" 77 #include "chrome/browser/chromeos/profiles/profile_helper.h"
78 #include "chrome/browser/lifetime/application_lifetime.h" 78 #include "chrome/browser/lifetime/application_lifetime.h"
79 #include "chromeos/chromeos_switches.h" 79 #include "chromeos/chromeos_switches.h"
80 #include "components/user_manager/user_manager.h" 80 #include "components/user_manager/user_manager.h"
81 #endif 81 #endif
82 82
83 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 83 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
84 #include "ui/events/x/touch_factory_x11.h" 84 #include "ui/events/devices/x11/touch_factory_x11.h"
85 #endif 85 #endif
86 86
87 #if defined(OS_MACOSX) 87 #if defined(OS_MACOSX)
88 #include "chrome/browser/web_applications/web_app_mac.h" 88 #include "chrome/browser/web_applications/web_app_mac.h"
89 #endif 89 #endif
90 90
91 #if defined(ENABLE_FULL_PRINTING) 91 #if defined(ENABLE_FULL_PRINTING)
92 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 92 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
93 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 93 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
94 #include "chrome/browser/printing/print_dialog_cloud.h" 94 #include "chrome/browser/printing/print_dialog_cloud.h"
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 // If we are showing the app list then chrome isn't shown so load the app 757 // If we are showing the app list then chrome isn't shown so load the app
758 // list's profile rather than chrome's. 758 // list's profile rather than chrome's.
759 if (command_line.HasSwitch(switches::kShowAppList)) { 759 if (command_line.HasSwitch(switches::kShowAppList)) {
760 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> 760 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
761 GetProfilePath(user_data_dir); 761 GetProfilePath(user_data_dir);
762 } 762 }
763 763
764 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 764 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
765 user_data_dir); 765 user_data_dir);
766 } 766 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698