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

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 10 matching lines...) Expand all
21 #include "chrome/browser/sync/profile_sync_service_factory.h" 21 #include "chrome/browser/sync/profile_sync_service_factory.h"
22 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
24 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 24 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
25 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 25 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
28 #include "chrome/grit/chromium_strings.h" 28 #include "chrome/grit/chromium_strings.h"
29 #include "chrome/grit/generated_resources.h" 29 #include "chrome/grit/generated_resources.h"
30 #include "chrome/grit/locale_settings.h" 30 #include "chrome/grit/locale_settings.h"
31 #include "components/browser_sync/browser/profile_sync_service.h" 31 #include "components/browser_sync/profile_sync_service.h"
32 #include "components/prefs/pref_service.h" 32 #include "components/prefs/pref_service.h"
33 #include "components/signin/core/browser/signin_error_controller.h" 33 #include "components/signin/core/browser/signin_error_controller.h"
34 #include "components/signin/core/browser/signin_manager_base.h" 34 #include "components/signin/core/browser/signin_manager_base.h"
35 #include "components/strings/grit/components_strings.h" 35 #include "components/strings/grit/components_strings.h"
36 #include "components/sync/base/model_type.h" 36 #include "components/sync/base/model_type.h"
37 #include "components/sync/engine/cycle/sync_cycle_snapshot.h" 37 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
38 #include "components/sync/protocol/proto_enum_conversions.h" 38 #include "components/sync/protocol/proto_enum_conversions.h"
39 #include "components/sync/protocol/sync_protocol_error.h" 39 #include "components/sync/protocol/sync_protocol_error.h"
40 #include "google_apis/gaia/google_service_auth_error.h" 40 #include "google_apis/gaia/google_service_auth_error.h"
41 #include "ui/base/l10n/l10n_util.h" 41 #include "ui/base/l10n/l10n_util.h"
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 base::string16 ConstructTime(int64_t time_in_int) { 487 base::string16 ConstructTime(int64_t time_in_int) {
488 base::Time time = base::Time::FromInternalValue(time_in_int); 488 base::Time time = base::Time::FromInternalValue(time_in_int);
489 489
490 // If time is null the format function returns a time in 1969. 490 // If time is null the format function returns a time in 1969.
491 if (time.is_null()) 491 if (time.is_null())
492 return base::string16(); 492 return base::string16();
493 return base::TimeFormatFriendlyDateAndTime(time); 493 return base::TimeFormatFriendlyDateAndTime(time);
494 } 494 }
495 495
496 } // namespace sync_ui_util 496 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_startup_tracker.cc ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698