chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc - Issue 196423023: Revert of Include sync.pb.h in sync_data.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 196423023: Revert of Include sync.pb.h in sync_data.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_apps_sync_test.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

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/suggestions_source_top_sites.h"	5 #include "chrome/browser/ui/webui/ntp/suggestions_source_top_sites.h"

6	6

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

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

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/stl_util.h"	10 #include "base/stl_util.h"

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

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

13 #include "chrome/browser/history/history_service.h"

14 #include "chrome/browser/history/history_service_factory.h"	13 #include "chrome/browser/history/history_service_factory.h"

15 #include "chrome/browser/history/top_sites.h"	14 #include "chrome/browser/history/top_sites.h"

16 #include "chrome/browser/history/visit_filter.h"	15 #include "chrome/browser/history/visit_filter.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"	17 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

19 #include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"	18 #include "chrome/browser/ui/webui/ntp/suggestions_combiner.h"

20 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

21	20

22	21

23 namespace {	22 namespace {

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 // static	136 // static

138 history::VisitFilter::SortingOrder	137 history::VisitFilter::SortingOrder

139 SuggestionsSourceTopSites::GetSortingOrder() {	138 SuggestionsSourceTopSites::GetSortingOrder() {

140 const CommandLine* cli = CommandLine::ForCurrentProcess();	139 const CommandLine* cli = CommandLine::ForCurrentProcess();

141 if (cli->HasSwitch(switches::kSuggestionNtpGaussianFilter))	140 if (cli->HasSwitch(switches::kSuggestionNtpGaussianFilter))

142 return history::VisitFilter::ORDER_BY_TIME_GAUSSIAN;	141 return history::VisitFilter::ORDER_BY_TIME_GAUSSIAN;

143 if (cli->HasSwitch(switches::kSuggestionNtpLinearFilter))	142 if (cli->HasSwitch(switches::kSuggestionNtpLinearFilter))

144 return history::VisitFilter::ORDER_BY_TIME_LINEAR;	143 return history::VisitFilter::ORDER_BY_TIME_LINEAR;

145 return history::VisitFilter::ORDER_BY_RECENCY;	144 return history::VisitFilter::ORDER_BY_RECENCY;

146 }	145 }

OLD	NEW