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

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

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a
Patch Set: Full change rebased on static lib. Created 4 years, 4 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/sync/sync_ui_util.h" 5 #include "chrome/browser/sync/sync_ui_util.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 27 matching lines...) Expand all
38 #include "components/sync/sessions/sync_session_snapshot.h" 38 #include "components/sync/sessions/sync_session_snapshot.h"
39 #include "google_apis/gaia/google_service_auth_error.h" 39 #include "google_apis/gaia/google_service_auth_error.h"
40 #include "grit/components_strings.h" 40 #include "grit/components_strings.h"
41 #include "ui/base/l10n/l10n_util.h" 41 #include "ui/base/l10n/l10n_util.h"
42 42
43 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
44 #include "components/signin/core/account_id/account_id.h" 44 #include "components/signin/core/account_id/account_id.h"
45 #include "components/user_manager/user_manager.h" 45 #include "components/user_manager/user_manager.h"
46 #else 46 #else
47 #include "chrome/browser/signin/signin_manager_factory.h" 47 #include "chrome/browser/signin/signin_manager_factory.h"
48 #include "components/sync_driver/sync_error_controller.h" 48 #include "components/sync/driver/sync_error_controller.h"
49 #endif // defined(OS_CHROMEOS) 49 #endif // defined(OS_CHROMEOS)
50 50
51 typedef GoogleServiceAuthError AuthError; 51 typedef GoogleServiceAuthError AuthError;
52 52
53 namespace sync_ui_util { 53 namespace sync_ui_util {
54 54
55 namespace { 55 namespace {
56 56
57 bool IsChromeDashboardEnabled() { 57 bool IsChromeDashboardEnabled() {
58 const std::string group_name = 58 const std::string group_name =
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 base::string16 ConstructTime(int64_t time_in_int) { 478 base::string16 ConstructTime(int64_t time_in_int) {
479 base::Time time = base::Time::FromInternalValue(time_in_int); 479 base::Time time = base::Time::FromInternalValue(time_in_int);
480 480
481 // If time is null the format function returns a time in 1969. 481 // If time is null the format function returns a time in 1969.
482 if (time.is_null()) 482 if (time.is_null())
483 return base::string16(); 483 return base::string16();
484 return base::TimeFormatFriendlyDateAndTime(time); 484 return base::TimeFormatFriendlyDateAndTime(time);
485 } 485 }
486 486
487 } // namespace sync_ui_util 487 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_startup_tracker.h ('k') | chrome/browser/sync/test/integration/fake_server_invalidation_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698