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

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

Issue 454583002: Cleanup: Remove unneeded #includes for grit/, ui/base/l10n/l10n_util.h and ui/base/resource/resourc… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Cros some more Created 6 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 | Annotate | Revision Log
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/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 17 matching lines...) Expand all
28 #include "google_apis/gaia/google_service_auth_error.h" 28 #include "google_apis/gaia/google_service_auth_error.h"
29 #include "grit/browser_resources.h" 29 #include "grit/browser_resources.h"
30 #include "grit/chromium_strings.h" 30 #include "grit/chromium_strings.h"
31 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 #include "grit/locale_settings.h" 32 #include "grit/locale_settings.h"
33 #include "sync/internal_api/public/base/model_type.h" 33 #include "sync/internal_api/public/base/model_type.h"
34 #include "sync/internal_api/public/sessions/sync_session_snapshot.h" 34 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
35 #include "sync/protocol/proto_enum_conversions.h" 35 #include "sync/protocol/proto_enum_conversions.h"
36 #include "sync/protocol/sync_protocol_error.h" 36 #include "sync/protocol/sync_protocol_error.h"
37 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
38 #include "ui/base/resource/resource_bundle.h"
39 38
40 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
41 #include "chrome/browser/chromeos/login/users/user_manager.h" 40 #include "chrome/browser/chromeos/login/users/user_manager.h"
42 #endif // defined(OS_CHROMEOS) 41 #endif // defined(OS_CHROMEOS)
43 42
44 typedef GoogleServiceAuthError AuthError; 43 typedef GoogleServiceAuthError AuthError;
45 44
46 namespace sync_ui_util { 45 namespace sync_ui_util {
47 46
48 namespace { 47 namespace {
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 base::string16 ConstructTime(int64 time_in_int) { 379 base::string16 ConstructTime(int64 time_in_int) {
381 base::Time time = base::Time::FromInternalValue(time_in_int); 380 base::Time time = base::Time::FromInternalValue(time_in_int);
382 381
383 // If time is null the format function returns a time in 1969. 382 // If time is null the format function returns a time in 1969.
384 if (time.is_null()) 383 if (time.is_null())
385 return base::string16(); 384 return base::string16();
386 return base::TimeFormatFriendlyDateAndTime(time); 385 return base::TimeFormatFriendlyDateAndTime(time);
387 } 386 }
388 387
389 } // namespace sync_ui_util 388 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_browsertest.cc ('k') | chrome/browser/task_manager/printing_information.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698