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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | Annotate | Revision Log
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 <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/sync/profile_sync_service_factory.h" 40 #include "chrome/browser/sync/profile_sync_service_factory.h"
41 #include "chrome/browser/ui/browser.h" 41 #include "chrome/browser/ui/browser.h"
42 #include "chrome/browser/ui/browser_iterator.h" 42 #include "chrome/browser/ui/browser_iterator.h"
43 #include "chrome/browser/ui/sync/sync_promo_ui.h" 43 #include "chrome/browser/ui/sync/sync_promo_ui.h"
44 #include "chrome/common/chrome_constants.h" 44 #include "chrome/common/chrome_constants.h"
45 #include "chrome/common/chrome_paths_internal.h" 45 #include "chrome/common/chrome_paths_internal.h"
46 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
47 #include "chrome/common/logging_chrome.h" 47 #include "chrome/common/logging_chrome.h"
48 #include "chrome/common/pref_names.h" 48 #include "chrome/common/pref_names.h"
49 #include "chrome/common/url_constants.h" 49 #include "chrome/common/url_constants.h"
50 #include "chrome/grit/generated_resources.h"
50 #include "components/bookmarks/browser/bookmark_model.h" 51 #include "components/bookmarks/browser/bookmark_model.h"
51 #include "components/password_manager/core/browser/password_store.h" 52 #include "components/password_manager/core/browser/password_store.h"
52 #include "components/signin/core/common/profile_management_switches.h" 53 #include "components/signin/core/common/profile_management_switches.h"
53 #include "content/public/browser/browser_thread.h" 54 #include "content/public/browser/browser_thread.h"
54 #include "content/public/browser/notification_service.h" 55 #include "content/public/browser/notification_service.h"
55 #include "content/public/browser/user_metrics.h" 56 #include "content/public/browser/user_metrics.h"
56 #include "extensions/browser/extension_registry.h" 57 #include "extensions/browser/extension_registry.h"
57 #include "extensions/common/extension_set.h" 58 #include "extensions/common/extension_set.h"
58 #include "extensions/common/manifest.h" 59 #include "extensions/common/manifest.h"
59 #include "grit/generated_resources.h"
60 #include "net/http/http_transaction_factory.h" 60 #include "net/http/http_transaction_factory.h"
61 #include "net/url_request/url_request_context.h" 61 #include "net/url_request/url_request_context.h"
62 #include "net/url_request/url_request_context_getter.h" 62 #include "net/url_request/url_request_context_getter.h"
63 #include "net/url_request/url_request_job.h" 63 #include "net/url_request/url_request_job.h"
64 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
65 65
66 #if defined(ENABLE_MANAGED_USERS) 66 #if defined(ENABLE_MANAGED_USERS)
67 #include "chrome/browser/supervised_user/supervised_user_service.h" 67 #include "chrome/browser/supervised_user/supervised_user_service.h"
68 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 68 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
69 #endif 69 #endif
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 last_non_supervised_profile_path.BaseName().MaybeAsASCII()); 1323 last_non_supervised_profile_path.BaseName().MaybeAsASCII());
1324 FinishDeletingProfile(profile_to_delete_path); 1324 FinishDeletingProfile(profile_to_delete_path);
1325 } 1325 }
1326 } 1326 }
1327 } 1327 }
1328 #endif 1328 #endif
1329 1329
1330 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1330 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1331 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1331 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1332 } 1332 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_list_desktop_unittest.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698