chrome/browser/sync/profile_sync_service.cc - Issue 10700027: browser: Move global error to subdir.

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 10700027: browser: Move global error to subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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

« no previous file with comments | « chrome/browser/protector/settings_change_global_error.cc ('k') | chrome/browser/sync/profile_sync_service_factory.cc » ('j') | no next file with comments »

OLD	NEW
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/sync/profile_sync_service.h"	5 #include "chrome/browser/sync/profile_sync_service.h"

6	6

7 #include <cstddef>	7 #include <cstddef>

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10 #include <utility>	10 #include <utility>

(...skipping 26 matching lines...) Expand all Loading...
37 #include "chrome/browser/sync/glue/data_type_controller.h"	37 #include "chrome/browser/sync/glue/data_type_controller.h"

38 #include "chrome/browser/sync/glue/session_data_type_controller.h"	38 #include "chrome/browser/sync/glue/session_data_type_controller.h"

39 #include "chrome/browser/sync/glue/session_model_associator.h"	39 #include "chrome/browser/sync/glue/session_model_associator.h"

40 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"	40 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"

41 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"	41 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"

42 #include "chrome/browser/sync/sync_global_error.h"	42 #include "chrome/browser/sync/sync_global_error.h"

43 #include "chrome/browser/sync/user_selectable_sync_type.h"	43 #include "chrome/browser/sync/user_selectable_sync_type.h"

44 #include "chrome/browser/ui/browser.h"	44 #include "chrome/browser/ui/browser.h"

45 #include "chrome/browser/ui/browser_list.h"	45 #include "chrome/browser/ui/browser_list.h"

46 #include "chrome/browser/ui/browser_window.h"	46 #include "chrome/browser/ui/browser_window.h"

47 #include "chrome/browser/ui/global_error_service.h"	47 #include "chrome/browser/ui/global_error/global_error_service.h"

48 #include "chrome/browser/ui/global_error_service_factory.h"	48 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

49 #include "chrome/common/chrome_notification_types.h"	49 #include "chrome/common/chrome_notification_types.h"

50 #include "chrome/common/chrome_switches.h"	50 #include "chrome/common/chrome_switches.h"

51 #include "chrome/common/chrome_version_info.h"	51 #include "chrome/common/chrome_version_info.h"

52 #include "chrome/common/net/gaia/gaia_constants.h"	52 #include "chrome/common/net/gaia/gaia_constants.h"

53 #include "chrome/common/time_format.h"	53 #include "chrome/common/time_format.h"

54 #include "chrome/common/url_constants.h"	54 #include "chrome/common/url_constants.h"

55 #include "content/public/browser/notification_details.h"	55 #include "content/public/browser/notification_details.h"

56 #include "content/public/browser/notification_source.h"	56 #include "content/public/browser/notification_source.h"

57 #include "grit/generated_resources.h"	57 #include "grit/generated_resources.h"

58 #include "net/cookies/cookie_monster.h"	58 #include "net/cookies/cookie_monster.h"

(...skipping 1664 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1723 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.	1723 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.

1724 ProfileSyncService* old_this = this;	1724 ProfileSyncService* old_this = this;

1725 this->~ProfileSyncService();	1725 this->~ProfileSyncService();

1726 new(old_this) ProfileSyncService(	1726 new(old_this) ProfileSyncService(

1727 new ProfileSyncComponentsFactoryImpl(profile,	1727 new ProfileSyncComponentsFactoryImpl(profile,

1728 CommandLine::ForCurrentProcess()),	1728 CommandLine::ForCurrentProcess()),

1729 profile,	1729 profile,

1730 signin,	1730 signin,

1731 behavior);	1731 behavior);

1732 }	1732 }

OLD	NEW