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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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_flow.cc ('k') | chrome/browser/sync/syncable/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/sync/profile_sync_service.h" 14 #include "chrome/browser/sync/profile_sync_service.h"
15 #include "chrome/browser/sync/profile_sync_service_factory.h" 15 #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/sync_protocol_error.h"
18 #include "chrome/browser/sync/syncable/model_type.h"
19 #include "chrome/browser/sync/sessions/session_state.h"
20 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
22 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 18 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
23 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 19 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
24 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
26 #include "chrome/common/net/gaia/google_service_auth_error.h" 22 #include "chrome/common/net/gaia/google_service_auth_error.h"
27 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
29 #include "grit/browser_resources.h" 25 #include "grit/browser_resources.h"
30 #include "grit/chromium_strings.h" 26 #include "grit/chromium_strings.h"
31 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
32 #include "grit/locale_settings.h" 28 #include "grit/locale_settings.h"
29 #include "sync/protocol/proto_enum_conversions.h"
30 #include "sync/protocol/sync_protocol_error.h"
31 #include "sync/sessions/session_state.h"
32 #include "sync/syncable/model_type.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
35 35
36 typedef GoogleServiceAuthError AuthError; 36 typedef GoogleServiceAuthError AuthError;
37 37
38 namespace sync_ui_util { 38 namespace sync_ui_util {
39 39
40 namespace { 40 namespace {
41 41
42 // Given an authentication state this helper function returns various labels 42 // Given an authentication state this helper function returns various labels
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 } 726 }
727 } else { 727 } else {
728 version_modifier = " " + version_modifier; 728 version_modifier = " " + version_modifier;
729 } 729 }
730 return chrome_version.Name() + " " + chrome_version.OSType() + " " + 730 return chrome_version.Name() + " " + chrome_version.OSType() + " " +
731 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + 731 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
732 version_modifier; 732 version_modifier;
733 } 733 }
734 734
735 } // namespace sync_ui_util 735 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/browser/sync/syncable/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698