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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 <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 28 matching lines...) Expand all
39 #include "chrome/browser/sync/profile_sync_service_factory.h" 39 #include "chrome/browser/sync/profile_sync_service_factory.h"
40 #include "chrome/browser/ui/browser.h" 40 #include "chrome/browser/ui/browser.h"
41 #include "chrome/browser/ui/browser_iterator.h" 41 #include "chrome/browser/ui/browser_iterator.h"
42 #include "chrome/browser/ui/sync/sync_promo_ui.h" 42 #include "chrome/browser/ui/sync/sync_promo_ui.h"
43 #include "chrome/common/chrome_constants.h" 43 #include "chrome/common/chrome_constants.h"
44 #include "chrome/common/chrome_paths_internal.h" 44 #include "chrome/common/chrome_paths_internal.h"
45 #include "chrome/common/chrome_switches.h" 45 #include "chrome/common/chrome_switches.h"
46 #include "chrome/common/logging_chrome.h" 46 #include "chrome/common/logging_chrome.h"
47 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
48 #include "chrome/common/url_constants.h" 48 #include "chrome/common/url_constants.h"
49 #include "components/bookmarks/core/browser/bookmark_model.h" 49 #include "components/bookmarks/browser/bookmark_model.h"
50 #include "components/signin/core/common/profile_management_switches.h" 50 #include "components/signin/core/common/profile_management_switches.h"
51 #include "content/public/browser/browser_thread.h" 51 #include "content/public/browser/browser_thread.h"
52 #include "content/public/browser/notification_service.h" 52 #include "content/public/browser/notification_service.h"
53 #include "content/public/browser/user_metrics.h" 53 #include "content/public/browser/user_metrics.h"
54 #include "extensions/browser/extension_registry.h" 54 #include "extensions/browser/extension_registry.h"
55 #include "extensions/common/extension_set.h" 55 #include "extensions/common/extension_set.h"
56 #include "extensions/common/manifest.h" 56 #include "extensions/common/manifest.h"
57 #include "grit/generated_resources.h" 57 #include "grit/generated_resources.h"
58 #include "net/http/http_transaction_factory.h" 58 #include "net/http/http_transaction_factory.h"
59 #include "net/url_request/url_request_context.h" 59 #include "net/url_request/url_request_context.h"
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 last_non_managed_profile_path.BaseName().MaybeAsASCII()); 1280 last_non_managed_profile_path.BaseName().MaybeAsASCII());
1281 FinishDeletingProfile(profile_to_delete_path); 1281 FinishDeletingProfile(profile_to_delete_path);
1282 } 1282 }
1283 } 1283 }
1284 } 1284 }
1285 #endif 1285 #endif
1286 1286
1287 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1287 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1288 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1288 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1289 } 1289 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/sync/glue/bookmark_change_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698