chrome/browser/autocomplete/autocomplete_provider.cc - Issue 343523003: Remove AutocompleteInput Type and PageClassification.

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/autocomplete/autocomplete_provider.cc

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 6 years, 6 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/autocomplete/autocomplete_input_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_provider_unittest.cc » ('j') | chrome/browser/autocomplete/autocomplete_result.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/autocomplete/autocomplete_provider.h"	5 #include "chrome/browser/autocomplete/autocomplete_provider.h"

6	6

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

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

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

	10 #include "chrome/browser/autocomplete/autocomplete_input.h"

10 #include "chrome/browser/autocomplete/autocomplete_match.h"	11 #include "chrome/browser/autocomplete/autocomplete_match.h"

11 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"	12 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"

12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

13 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/common/pref_names.h"	15 #include "chrome/common/pref_names.h"

15 #include "components/bookmarks/browser/bookmark_model.h"	16 #include "components/bookmarks/browser/bookmark_model.h"

16 #include "components/url_fixer/url_fixer.h"	17 #include "components/url_fixer/url_fixer.h"

17 #include "content/public/common/url_constants.h"	18 #include "content/public/common/url_constants.h"

18 #include "net/base/net_util.h"	19 #include "net/base/net_util.h"

19 #include "url/gurl.h"	20 #include "url/gurl.h"

(...skipping 196 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
216 DCHECK_NE(base::string16::npos, scheme_pos);	217 DCHECK_NE(base::string16::npos, scheme_pos);

217	218

218 // Erase scheme plus up to two slashes.	219 // Erase scheme plus up to two slashes.

219 size_t prefix_end = scheme_pos + strlen(url::kHttpScheme) + 1;	220 size_t prefix_end = scheme_pos + strlen(url::kHttpScheme) + 1;

220 const size_t after_slashes = std::min(url->length(), prefix_end + 2);	221 const size_t after_slashes = std::min(url->length(), prefix_end + 2);

221 while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))	222 while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))

222 ++prefix_end;	223 ++prefix_end;

223 url->erase(scheme_pos, prefix_end - scheme_pos);	224 url->erase(scheme_pos, prefix_end - scheme_pos);

224 return (scheme_pos == 0) ? prefix_end : 0;	225 return (scheme_pos == 0) ? prefix_end : 0;

225 }	226 }

226

OLD	NEW