chrome/browser/sync/sync_ui_util.cc - Issue 10690071: [Sync] Move model_type* from syncable/ to base/

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

Issue 10690071: [Sync] Move model_type* from syncable/ to base/ (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/sync/sync_prefs_unittest.cc ('k') | chrome/browser/sync/test/integration/enable_disable_test.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/sync_ui_util.h"	5 #include "chrome/browser/sync/sync_ui_util.h"

6	6

7 #include "base/i18n/number_formatting.h"	7 #include "base/i18n/number_formatting.h"

8 #include "base/i18n/time_formatting.h"	8 #include "base/i18n/time_formatting.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/prefs/pref_service.h"	11 #include "chrome/browser/prefs/pref_service.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/profiles/profile_manager.h"	13 #include "chrome/browser/profiles/profile_manager.h"

14 #include "chrome/browser/signin/signin_manager.h"	14 #include "chrome/browser/signin/signin_manager.h"

15 #include "chrome/browser/sync/profile_sync_service.h"	15 #include "chrome/browser/sync/profile_sync_service.h"

16 #include "chrome/browser/sync/profile_sync_service_factory.h"	16 #include "chrome/browser/sync/profile_sync_service_factory.h"

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

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

19 #include "chrome/browser/ui/webui/signin/login_ui_service.h"	19 #include "chrome/browser/ui/webui/signin/login_ui_service.h"

20 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"	20 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

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

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

23 #include "chrome/common/net/gaia/google_service_auth_error.h"	23 #include "chrome/common/net/gaia/google_service_auth_error.h"

24 #include "chrome/common/pref_names.h"	24 #include "chrome/common/pref_names.h"

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

26 #include "grit/browser_resources.h"	26 #include "grit/browser_resources.h"

27 #include "grit/chromium_strings.h"	27 #include "grit/chromium_strings.h"

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

29 #include "grit/locale_settings.h"	29 #include "grit/locale_settings.h"

	30 #include "sync/internal_api/public/base/model_type.h"

30 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"	31 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"

31 #include "sync/internal_api/public/syncable/model_type.h"

32 #include "sync/protocol/proto_enum_conversions.h"	32 #include "sync/protocol/proto_enum_conversions.h"

33 #include "sync/protocol/sync_protocol_error.h"	33 #include "sync/protocol/sync_protocol_error.h"

34 #include "ui/base/l10n/l10n_util.h"	34 #include "ui/base/l10n/l10n_util.h"

35 #include "ui/base/resource/resource_bundle.h"	35 #include "ui/base/resource/resource_bundle.h"

36	36

37 typedef GoogleServiceAuthError AuthError;	37 typedef GoogleServiceAuthError AuthError;

38	38

39 namespace sync_ui_util {	39 namespace sync_ui_util {

40	40

41 namespace {	41 namespace {

(...skipping 733 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
775 }	775 }

776 } else {	776 } else {

777 version_modifier = " " + version_modifier;	777 version_modifier = " " + version_modifier;

778 }	778 }

779 return chrome_version.Name() + " " + chrome_version.OSType() + " " +	779 return chrome_version.Name() + " " + chrome_version.OSType() + " " +

780 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +	780 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +

781 version_modifier;	781 version_modifier;

782 }	782 }

783	783

784 } // namespace sync_ui_util	784 } // namespace sync_ui_util

OLD	NEW