chrome/browser/sync/sync_ui_util.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« chrome/browser/password_manager/password_manager_util_win.cc ('K') | « chrome/browser/sync/sync_global_error.cc ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »
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/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"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.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/profile_oauth2_token_service_factory.h"	14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

15 #include "chrome/browser/signin/signin_ui_util.h"	15 #include "chrome/browser/signin/signin_ui_util.h"

16 #include "chrome/browser/sync/profile_sync_service.h"	16 #include "chrome/browser/sync/profile_sync_service.h"

17 #include "chrome/browser/sync/profile_sync_service_factory.h"	17 #include "chrome/browser/sync/profile_sync_service_factory.h"

18 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_window.h"	19 #include "chrome/browser/ui/browser_window.h"

20 #include "chrome/browser/ui/webui/signin/login_ui_service.h"	20 #include "chrome/browser/ui/webui/signin/login_ui_service.h"

21 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"	21 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

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

23 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

24 #include "chrome/common/url_constants.h"	24 #include "chrome/common/url_constants.h"

	25 #include "chrome/grit/chromium_strings.h"

	26 #include "chrome/grit/generated_resources.h"

25 #include "components/signin/core/browser/profile_oauth2_token_service.h"	27 #include "components/signin/core/browser/profile_oauth2_token_service.h"

26 #include "components/signin/core/browser/signin_error_controller.h"	28 #include "components/signin/core/browser/signin_error_controller.h"

27 #include "components/signin/core/browser/signin_manager_base.h"	29 #include "components/signin/core/browser/signin_manager_base.h"

28 #include "google_apis/gaia/google_service_auth_error.h"	30 #include "google_apis/gaia/google_service_auth_error.h"

29 #include "grit/browser_resources.h"	31 #include "grit/browser_resources.h"

30 #include "grit/chromium_strings.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	38

39 #if defined(OS_CHROMEOS)	39 #if defined(OS_CHROMEOS)

40 #include "chrome/browser/chromeos/login/users/user_manager.h"	40 #include "chrome/browser/chromeos/login/users/user_manager.h"

41 #endif // defined(OS_CHROMEOS)	41 #endif // defined(OS_CHROMEOS)

(...skipping 337 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
379 base::string16 ConstructTime(int64 time_in_int) {	379 base::string16 ConstructTime(int64 time_in_int) {

380 base::Time time = base::Time::FromInternalValue(time_in_int);	380 base::Time time = base::Time::FromInternalValue(time_in_int);

381	381

382 // 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.

383 if (time.is_null())	383 if (time.is_null())

384 return base::string16();	384 return base::string16();

385 return base::TimeFormatFriendlyDateAndTime(time);	385 return base::TimeFormatFriendlyDateAndTime(time);

386 }	386 }

387	387

388 } // namespace sync_ui_util	388 } // namespace sync_ui_util

OLD	NEW