chrome/browser/sync/sync_ui_util.cc - Issue 9295044: Start moving signin code out of browser/sync.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9295044: Start moving signin code out of browser/sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed unit test Created 8 years, 10 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_setup_wizard_unittest.cc ('k') | chrome/browser/ui/webui/options/options_sync_setup_handler.h » ('j') | chrome/browser/ui/webui/signin/login_ui_service.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

16 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"	17 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"

17 #include "chrome/browser/sync/protocol/sync_protocol_error.h"	18 #include "chrome/browser/sync/protocol/sync_protocol_error.h"

18 #include "chrome/browser/sync/syncable/model_type.h"	19 #include "chrome/browser/sync/syncable/model_type.h"

19 #include "chrome/browser/sync/sessions/session_state.h"	20 #include "chrome/browser/sync/sessions/session_state.h"

20 #include "chrome/browser/ui/browser.h"	21 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

22 #include "chrome/common/chrome_switches.h"	23 #include "chrome/common/chrome_switches.h"

23 #include "chrome/common/chrome_version_info.h"	24 #include "chrome/common/chrome_version_info.h"

(...skipping 678 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
702 }	703 }

703 } else {	704 } else {

704 version_modifier = " " + version_modifier;	705 version_modifier = " " + version_modifier;

705 }	706 }

706 return chrome_version.Name() + " " + chrome_version.OSType() + " " +	707 return chrome_version.Name() + " " + chrome_version.OSType() + " " +

707 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +	708 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +

708 version_modifier;	709 version_modifier;

709 }	710 }

710	711

711 } // namespace sync_ui_util	712 } // namespace sync_ui_util

OLD	NEW