chrome/browser/autocomplete/autocomplete_match.cc - Issue 190063004: chromeos: Delete old, unused contacts code.

Side by Side Diff: chrome/browser/autocomplete/autocomplete_match.cc

Issue 190063004: chromeos: Delete old, unused contacts code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: undo unwanted indenting changes 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/autocomplete/autocomplete_controller.cc ('k') | chrome/browser/autocomplete/autocomplete_provider.h » ('j') | chrome/common/autocomplete_match_type.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_match.h"	5 #include "chrome/browser/autocomplete/autocomplete_match.h"

6	6

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

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

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

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

(...skipping 132 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
143 IDR_OMNIBOX_HTTP,	143 IDR_OMNIBOX_HTTP,

144 IDR_OMNIBOX_SEARCH,	144 IDR_OMNIBOX_SEARCH,

145 IDR_OMNIBOX_SEARCH,	145 IDR_OMNIBOX_SEARCH,

146 IDR_OMNIBOX_SEARCH,	146 IDR_OMNIBOX_SEARCH,

147 IDR_OMNIBOX_SEARCH,	147 IDR_OMNIBOX_SEARCH,

148 IDR_OMNIBOX_SEARCH,	148 IDR_OMNIBOX_SEARCH,

149 IDR_OMNIBOX_SEARCH,	149 IDR_OMNIBOX_SEARCH,

150 IDR_OMNIBOX_SEARCH,	150 IDR_OMNIBOX_SEARCH,

151 IDR_OMNIBOX_SEARCH,	151 IDR_OMNIBOX_SEARCH,

152 IDR_OMNIBOX_EXTENSION_APP,	152 IDR_OMNIBOX_EXTENSION_APP,

153 // ContactProvider isn't used by the omnibox, so this icon is never

154 // displayed.

155 IDR_OMNIBOX_SEARCH,
Mark P 2014/03/07 17:20:14 You're going to revert this change to this file af You're going to revert this change to this file after reading my other comments. Daniel Erat 2014/03/07 21:52:57 Done. Show quoted text On 2014/03/07 17:20:14, Mark P wrote: > You're going to revert this change to this file after reading my other comments. Done.
156 IDR_OMNIBOX_HTTP,	153 IDR_OMNIBOX_HTTP,

157 };	154 };

158 COMPILE_ASSERT(arraysize(icons) == AutocompleteMatchType::NUM_TYPES,	155 COMPILE_ASSERT(arraysize(icons) == AutocompleteMatchType::NUM_TYPES,

159 icons_array_must_match_type_enum);	156 icons_array_must_match_type_enum);

160 return icons[type];	157 return icons[type];

161 }	158 }

162	159

163 // static	160 // static

164 int AutocompleteMatch::TypeToLocationBarIcon(Type type) {	161 int AutocompleteMatch::TypeToLocationBarIcon(Type type) {

165 int id = TypeToIcon(type);	162 int id = TypeToIcon(type);

(...skipping 338 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
504 << " is unsorted in relation to last offset of " << last_offset	501 << " is unsorted in relation to last offset of " << last_offset

505 << ". Provider: " << provider_name << ".";	502 << ". Provider: " << provider_name << ".";

506 DCHECK_LT(i->offset, text.length())	503 DCHECK_LT(i->offset, text.length())

507 << " Classification of [" << i->offset << "," << text.length()	504 << " Classification of [" << i->offset << "," << text.length()

508 << "] is out of bounds for \"" << text << "\". Provider: "	505 << "] is out of bounds for \"" << text << "\". Provider: "

509 << provider_name << ".";	506 << provider_name << ".";

510 last_offset = i->offset;	507 last_offset = i->offset;

511 }	508 }

512 }	509 }

513 #endif	510 #endif

OLD	NEW