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

Side by Side Diff: chrome/browser/ui/app_list/search/search_controller.cc

Issue 23874015: Implement people search. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/app_list/search/search_controller.h" 5 #include "chrome/browser/ui/app_list/search/search_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/app_list/search/app_search_provider.h" 17 #include "chrome/browser/ui/app_list/search/app_search_provider.h"
18 #include "chrome/browser/ui/app_list/search/chrome_search_result.h" 18 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
19 #include "chrome/browser/ui/app_list/search/history.h" 19 #include "chrome/browser/ui/app_list/search/history.h"
20 #include "chrome/browser/ui/app_list/search/history_factory.h" 20 #include "chrome/browser/ui/app_list/search/history_factory.h"
21 #include "chrome/browser/ui/app_list/search/omnibox_provider.h" 21 #include "chrome/browser/ui/app_list/search/omnibox_provider.h"
22 #include "chrome/browser/ui/app_list/search/people/people_provider.h"
22 #include "chrome/browser/ui/app_list/search/search_provider.h" 23 #include "chrome/browser/ui/app_list/search/search_provider.h"
23 #include "chrome/browser/ui/app_list/search/webstore_provider.h" 24 #include "chrome/browser/ui/app_list/search/webstore/webstore_provider.h"
25 #include "chrome/common/chrome_switches.h"
24 #include "content/public/browser/user_metrics.h" 26 #include "content/public/browser/user_metrics.h"
25 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
27 #include "ui/app_list/search_box_model.h" 29 #include "ui/app_list/search_box_model.h"
28 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
30 32
31 namespace { 33 namespace {
32 const char kAppListSearchResultOpenTypeHistogram[] = 34 const char kAppListSearchResultOpenTypeHistogram[] =
33 "Apps.AppListSearchResultOpenType"; 35 "Apps.AppListSearchResultOpenType";
(...skipping 23 matching lines...) Expand all
57 GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); 59 GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
58 60
59 mixer_->Init(); 61 mixer_->Init();
60 62
61 AddProvider(Mixer::MAIN_GROUP, scoped_ptr<SearchProvider>( 63 AddProvider(Mixer::MAIN_GROUP, scoped_ptr<SearchProvider>(
62 new AppSearchProvider(profile_, list_controller_)).Pass()); 64 new AppSearchProvider(profile_, list_controller_)).Pass());
63 AddProvider(Mixer::OMNIBOX_GROUP, scoped_ptr<SearchProvider>( 65 AddProvider(Mixer::OMNIBOX_GROUP, scoped_ptr<SearchProvider>(
64 new OmniboxProvider(profile_)).Pass()); 66 new OmniboxProvider(profile_)).Pass());
65 AddProvider(Mixer::WEBSTORE_GROUP, scoped_ptr<SearchProvider>( 67 AddProvider(Mixer::WEBSTORE_GROUP, scoped_ptr<SearchProvider>(
66 new WebstoreProvider(profile_, list_controller_)).Pass()); 68 new WebstoreProvider(profile_, list_controller_)).Pass());
69 if (CommandLine::ForCurrentProcess()->HasSwitch(
70 switches::kEnablePeopleSearch)) {
71 AddProvider(Mixer::PEOPLE_GROUP, scoped_ptr<SearchProvider>(
72 new PeopleProvider(profile_)).Pass());
73 }
67 } 74 }
68 75
69 void SearchController::Start() { 76 void SearchController::Start() {
70 Stop(); 77 Stop();
71 78
72 string16 query; 79 string16 query;
73 TrimWhitespace(search_box_->text(), TRIM_ALL, &query); 80 TrimWhitespace(search_box_->text(), TRIM_ALL, &query);
74 81
75 dispatching_query_ = true; 82 dispatching_query_ = true;
76 for (Providers::iterator it = providers_.begin(); 83 for (Providers::iterator it = providers_.begin();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 KnownResults known_results; 148 KnownResults known_results;
142 if (history_ && history_->IsReady()) { 149 if (history_ && history_->IsReady()) {
143 history_->GetKnownResults(UTF16ToUTF8(search_box_->text())) 150 history_->GetKnownResults(UTF16ToUTF8(search_box_->text()))
144 ->swap(known_results); 151 ->swap(known_results);
145 } 152 }
146 153
147 mixer_->MixAndPublish(known_results); 154 mixer_->MixAndPublish(known_results);
148 } 155 }
149 156
150 } // namespace app_list 157 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698