Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Side by Side Diff: components/omnibox/browser/autocomplete_controller.cc

Issue 2712513004: Use a qualified path for grit-generated headers in components/ (Closed)
Patch Set: more checkdeps Created 3 years, 10 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
OLDNEW
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 "components/omnibox/browser/autocomplete_controller.h" 5 #include "components/omnibox/browser/autocomplete_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 15 matching lines...) Expand all
26 #include "components/omnibox/browser/history_url_provider.h" 26 #include "components/omnibox/browser/history_url_provider.h"
27 #include "components/omnibox/browser/keyword_provider.h" 27 #include "components/omnibox/browser/keyword_provider.h"
28 #include "components/omnibox/browser/omnibox_field_trial.h" 28 #include "components/omnibox/browser/omnibox_field_trial.h"
29 #include "components/omnibox/browser/physical_web_provider.h" 29 #include "components/omnibox/browser/physical_web_provider.h"
30 #include "components/omnibox/browser/search_provider.h" 30 #include "components/omnibox/browser/search_provider.h"
31 #include "components/omnibox/browser/shortcuts_provider.h" 31 #include "components/omnibox/browser/shortcuts_provider.h"
32 #include "components/omnibox/browser/zero_suggest_provider.h" 32 #include "components/omnibox/browser/zero_suggest_provider.h"
33 #include "components/open_from_clipboard/clipboard_recent_content.h" 33 #include "components/open_from_clipboard/clipboard_recent_content.h"
34 #include "components/search_engines/template_url.h" 34 #include "components/search_engines/template_url.h"
35 #include "components/search_engines/template_url_service.h" 35 #include "components/search_engines/template_url_service.h"
36 #include "grit/components_strings.h" 36 #include "components/strings/grit/components_strings.h"
37 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
38 38
39 namespace { 39 namespace {
40 40
41 // Converts the given match to a type (and possibly subtype) based on the AQS 41 // Converts the given match to a type (and possibly subtype) based on the AQS
42 // specification. For more details, see 42 // specification. For more details, see
43 // http://goto.google.com/binary-clients-logging. 43 // http://goto.google.com/binary-clients-logging.
44 void AutocompleteMatchToAssistedQuery( 44 void AutocompleteMatchToAssistedQuery(
45 const AutocompleteMatch::Type& match, 45 const AutocompleteMatch::Type& match,
46 const AutocompleteProvider* provider, 46 const AutocompleteProvider* provider,
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 expire_timer_.Stop(); 682 expire_timer_.Stop();
683 stop_timer_.Stop(); 683 stop_timer_.Stop();
684 done_ = true; 684 done_ = true;
685 if (clear_result && !result_.empty()) { 685 if (clear_result && !result_.empty()) {
686 result_.Reset(); 686 result_.Reset();
687 // NOTE: We pass in false since we're trying to only clear the popup, not 687 // NOTE: We pass in false since we're trying to only clear the popup, not
688 // touch the edit... this is all a mess and should be cleaned up :( 688 // touch the edit... this is all a mess and should be cleaned up :(
689 NotifyChanged(false); 689 NotifyChanged(false);
690 } 690 }
691 } 691 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698