| OLD | NEW |
| 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/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/ui/app_list/search/app_search_provider.h" | 16 #include "chrome/browser/ui/app_list/search/app_search_provider.h" |
| 17 #include "chrome/browser/ui/app_list/search/chrome_search_result.h" | 17 #include "chrome/browser/ui/app_list/search/chrome_search_result.h" |
| 18 #include "chrome/browser/ui/app_list/search/history.h" | 18 #include "chrome/browser/ui/app_list/search/history.h" |
| 19 #include "chrome/browser/ui/app_list/search/history_factory.h" | 19 #include "chrome/browser/ui/app_list/search/history_factory.h" |
| 20 #include "chrome/browser/ui/app_list/search/omnibox_provider.h" | 20 #include "chrome/browser/ui/app_list/search/omnibox_provider.h" |
| 21 #include "chrome/browser/ui/app_list/search/search_provider.h" | 21 #include "chrome/browser/ui/app_list/search/search_provider.h" |
| 22 #include "chrome/browser/ui/app_list/search/webstore_provider.h" | 22 #include "chrome/browser/ui/app_list/search/webstore_provider.h" |
| 23 #include "content/public/browser/user_metrics.h" | 23 #include "content/public/browser/user_metrics.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 KnownResults known_results; | 132 KnownResults known_results; |
| 133 if (history_ && history_->IsReady()) { | 133 if (history_ && history_->IsReady()) { |
| 134 history_->GetKnownResults(UTF16ToUTF8(search_box_->text())) | 134 history_->GetKnownResults(UTF16ToUTF8(search_box_->text())) |
| 135 ->swap(known_results); | 135 ->swap(known_results); |
| 136 } | 136 } |
| 137 | 137 |
| 138 mixer_->MixAndPublish(known_results); | 138 mixer_->MixAndPublish(known_results); |
| 139 } | 139 } |
| 140 | 140 |
| 141 } // namespace app_list | 141 } // namespace app_list |
| OLD | NEW |