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

Side by Side Diff: chrome/browser/profiles/profile_manager.cc

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 11 months 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 (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/profiles/profile_manager.h" 5 #include "chrome/browser/profiles/profile_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 #include "chrome/browser/supervised_user/supervised_user_service.h" 103 #include "chrome/browser/supervised_user/supervised_user_service.h"
104 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 104 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
105 #endif 105 #endif
106 106
107 #if !defined(OS_IOS) 107 #if !defined(OS_IOS)
108 #include "chrome/browser/sessions/session_service_factory.h" 108 #include "chrome/browser/sessions/session_service_factory.h"
109 #include "chrome/browser/ui/browser_list.h" 109 #include "chrome/browser/ui/browser_list.h"
110 #endif // !defined (OS_IOS) 110 #endif // !defined (OS_IOS)
111 111
112 #if defined(OS_WIN) 112 #if defined(OS_WIN)
113 #include "base/win/metro.h"
114 #include "chrome/installer/util/browser_distribution.h" 113 #include "chrome/installer/util/browser_distribution.h"
115 #endif 114 #endif
116 115
117 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
118 #include "chrome/browser/browser_process_platform_part_chromeos.h" 117 #include "chrome/browser/browser_process_platform_part_chromeos.h"
119 #include "chrome/browser/chromeos/profiles/profile_helper.h" 118 #include "chrome/browser/chromeos/profiles/profile_helper.h"
120 #include "chromeos/chromeos_switches.h" 119 #include "chromeos/chromeos_switches.h"
121 #include "chromeos/dbus/cryptohome_client.h" 120 #include "chromeos/dbus/cryptohome_client.h"
122 #include "chromeos/dbus/dbus_thread_manager.h" 121 #include "chromeos/dbus/dbus_thread_manager.h"
123 #include "components/user_manager/user.h" 122 #include "components/user_manager/user.h"
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 1543
1545 FinishDeletingProfile(profile_to_delete_path, new_active_profile_path); 1544 FinishDeletingProfile(profile_to_delete_path, new_active_profile_path);
1546 if (!original_callback.is_null()) 1545 if (!original_callback.is_null())
1547 original_callback.Run(loaded_profile, status); 1546 original_callback.Run(loaded_profile, status);
1548 } 1547 }
1549 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 1548 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
1550 1549
1551 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1550 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1552 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1551 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1553 } 1552 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698