chrome/browser/ui/webui/ntp/foreign_session_handler.cc - Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill.

Side by Side Diff: chrome/browser/ui/webui/ntp/foreign_session_handler.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pure merge of LKGR Created 7 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/ui/webui/ntp/app_launcher_handler.cc ('k') | chrome/browser/ui/webui/ntp/most_visited_handler.cc » ('j') | components/user_prefs/pref_registry_syncable.h » ('J')
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/ui/webui/ntp/foreign_session_handler.h"	5 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/bind.h"	11 #include "base/bind.h"

12 #include "base/bind_helpers.h"	12 #include "base/bind_helpers.h"

13 #include "base/i18n/time_formatting.h"	13 #include "base/i18n/time_formatting.h"

14 #include "base/memory/scoped_vector.h"	14 #include "base/memory/scoped_vector.h"

15 #include "base/prefs/pref_service.h"	15 #include "base/prefs/pref_service.h"

16 #include "base/strings/string_number_conversions.h"	16 #include "base/strings/string_number_conversions.h"

17 #include "base/utf_string_conversions.h"	17 #include "base/utf_string_conversions.h"

18 #include "base/values.h"	18 #include "base/values.h"

19 #include "chrome/browser/prefs/pref_registry_syncable.h"

20 #include "chrome/browser/prefs/scoped_user_pref_update.h"	19 #include "chrome/browser/prefs/scoped_user_pref_update.h"

21 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/sessions/session_restore.h"	21 #include "chrome/browser/sessions/session_restore.h"

23 #include "chrome/browser/sync/profile_sync_service.h"	22 #include "chrome/browser/sync/profile_sync_service.h"

24 #include "chrome/browser/sync/profile_sync_service_factory.h"	23 #include "chrome/browser/sync/profile_sync_service_factory.h"

25 #include "chrome/browser/ui/host_desktop.h"	24 #include "chrome/browser/ui/host_desktop.h"

26 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"	25 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

27 #include "chrome/browser/ui/webui/session_favicon_source.h"	26 #include "chrome/browser/ui/webui/session_favicon_source.h"

28 #include "chrome/common/chrome_notification_types.h"	27 #include "chrome/common/chrome_notification_types.h"

29 #include "chrome/common/pref_names.h"	28 #include "chrome/common/pref_names.h"

30 #include "chrome/common/time_format.h"	29 #include "chrome/common/time_format.h"

31 #include "chrome/common/url_constants.h"	30 #include "chrome/common/url_constants.h"

	31 #include "components/user_prefs/pref_registry_syncable.h"

32 #include "content/public/browser/notification_service.h"	32 #include "content/public/browser/notification_service.h"

33 #include "content/public/browser/notification_source.h"	33 #include "content/public/browser/notification_source.h"

34 #include "content/public/browser/url_data_source.h"	34 #include "content/public/browser/url_data_source.h"

35 #include "content/public/browser/web_contents.h"	35 #include "content/public/browser/web_contents.h"

36 #include "content/public/browser/web_contents_view.h"	36 #include "content/public/browser/web_contents_view.h"

37 #include "content/public/browser/web_ui.h"	37 #include "content/public/browser/web_ui.h"

38 #include "grit/generated_resources.h"	38 #include "grit/generated_resources.h"

39 #include "ui/base/l10n/l10n_util.h"	39 #include "ui/base/l10n/l10n_util.h"

40 #include "ui/webui/web_ui_util.h"	40 #include "ui/webui/web_ui_util.h"

41	41

(...skipping 361 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
403 dictionary->SetString("userVisibleTimestamp",	403 dictionary->SetString("userVisibleTimestamp",

404 last_synced < base::TimeDelta::FromMinutes(1) ?	404 last_synced < base::TimeDelta::FromMinutes(1) ?

405 l10n_util::GetStringUTF16(IDS_SYNC_TIME_JUST_NOW) :	405 l10n_util::GetStringUTF16(IDS_SYNC_TIME_JUST_NOW) :

406 TimeFormat::TimeElapsed(last_synced));	406 TimeFormat::TimeElapsed(last_synced));

407 dictionary->SetInteger("sessionId", window.window_id.id());	407 dictionary->SetInteger("sessionId", window.window_id.id());

408 dictionary->Set("tabs", tab_values.release());	408 dictionary->Set("tabs", tab_values.release());

409 return true;	409 return true;

410 }	410 }

411	411

412 } // namespace browser_sync	412 } // namespace browser_sync

OLD	NEW