app_list: Add search box and search result view for v2.

chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc

Index: chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc
diff --git a/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc b/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc
deleted file mode 100644
index a6601051a28c6e9df88ddf746b9295bb8334596e..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/ash/app_list/app_list_model_builder.cc
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/ash/app_list/app_list_model_builder.h"
-
-#include "base/i18n/case_conversion.h"
-#include "base/i18n/string_search.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/views/ash/app_list/extension_app_item.h"
-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/extensions/extension.h"
-#include "content/public/browser/notification_service.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_collator.h"
-#include "ui/base/resource/resource_bundle.h"
-
-using extensions::Extension;
-
-namespace {
-
-const char* kSpecialApps[] = {
-  extension_misc::kWebStoreAppId,
-};
-
-class ChromeAppItem : public ChromeAppListItem {
- public:
-  ChromeAppItem() : ChromeAppListItem(TYPE_OTHER) {
-    SetTitle(l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME));
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    SetIcon(*rb.GetImageNamed(IDR_PRODUCT_LOGO_128).ToSkBitmap());
-  }
-
- private:
-  // Overridden from ChromeAppListItem:
-  virtual void Activate(int event_flags) OVERRIDE {
-    ChromeLauncherController* controller = ChromeLauncherController::instance();
-    if (event_flags & ui::EF_CONTROL_DOWN)
-      controller->CreateNewWindow();
-    else
-      controller->CreateNewTab();
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(ChromeAppItem);
-};
-
-// ModelItemSortData provides a string key to sort with
-// l10n_util::StringComparator.
-struct ModelItemSortData {
-  explicit ModelItemSortData(app_list::AppListItemModel* item)
-      : item(item),
-        key(base::i18n::ToLower(UTF8ToUTF16(item->title()))) {
-  }
-
-  // Needed by StringComparator<Element> in SortVectorWithStringKey, which uses
-  // this method to get a key to sort.
-  const string16& GetStringKey() const {
-    return key;
-  }
-
-  app_list::AppListItemModel* item;
-  string16 key;
-};
-
-// Returns true if given |extension_id| is listed in kSpecialApps.
-bool IsSpecialApp(const std::string& extension_id) {
-  for (size_t i = 0; i < arraysize(kSpecialApps); ++i) {
-    if (extension_id == kSpecialApps[i])
-      return true;
-  }
-
-  return false;
-}
-
-// Returns true if given |str| matches |query|. Currently, it returns
-// if |query| is a substr of |str|.
-bool MatchesQuery(const string16& query, const string16& str) {
-  return query.empty() ||
-      base::i18n::StringSearchIgnoringCaseAndAccents(query, str);
-}
-
-}  // namespace
-
-AppListModelBuilder::AppListModelBuilder(Profile* profile)
-    : profile_(profile),
-      model_(NULL),
-      special_items_count_(0) {
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
-      content::Source<Profile>(profile_));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
-      content::Source<Profile>(profile_));
-  registrar_.Add(this, chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,
-      content::Source<Profile>(profile_));
-}
-
-AppListModelBuilder::~AppListModelBuilder() {
-}
-
-void AppListModelBuilder::SetModel(app_list::AppListModel* model) {
-  model_ = model;
-}
-
-void AppListModelBuilder::Build(const std::string& query) {
-  DCHECK(model_ && model_->item_count() == 0);
-  CreateSpecialItems();
-
-  query_ = base::i18n::ToLower(UTF8ToUTF16(query));
-
-  Items items;
-  GetExtensionApps(query_, &items);
-
-  SortAndPopulateModel(items);
-  HighlightApp();
-}
-
-void AppListModelBuilder::SortAndPopulateModel(const Items& items) {
-  // Just return if there is nothing to populate.
-  if (items.empty())
-    return;
-
-  // Sort items case insensitive alphabetically.
-  std::vector<ModelItemSortData> sorted;
-  for (Items::const_iterator it = items.begin(); it != items.end(); ++it)
-    sorted.push_back(ModelItemSortData(*it));
-
-  l10n_util::SortVectorWithStringKey(g_browser_process->GetApplicationLocale(),
-                                     &sorted,
-                                     false /* needs_stable_sort */);
-  for (std::vector<ModelItemSortData>::const_iterator it = sorted.begin();
-       it != sorted.end();
-       ++it) {
-    model_->AddItem(it->item);
-  }
-}
-
-void AppListModelBuilder::InsertItemByTitle(app_list::AppListItemModel* item) {
-  DCHECK(model_);
-
-  icu::Locale locale(g_browser_process->GetApplicationLocale().c_str());
-  UErrorCode error = U_ZERO_ERROR;
-  scoped_ptr<icu::Collator> collator(
-      icu::Collator::createInstance(locale, error));
-  if (U_FAILURE(error))
-    collator.reset();
-
-  l10n_util::StringComparator<string16> c(collator.get());
-  ModelItemSortData data(item);
-  for (size_t i = special_items_count_; i < model_->item_count(); ++i) {
-    ModelItemSortData current(model_->GetItemAt(i));
-    if (!c(current.key, data.key)) {
-      model_->AddItemAt(i, item);
-      return;
-    }
-  }
-  model_->AddItem(item);
-}
-
-void AppListModelBuilder::GetExtensionApps(const string16& query,
-                                           Items* items) {
-  DCHECK(profile_);
-  ExtensionService* service = profile_->GetExtensionService();
-  if (!service)
-    return;
-
-  // Get extension apps.
-  const ExtensionSet* extensions = service->extensions();
-  for (ExtensionSet::const_iterator app = extensions->begin();
-       app != extensions->end(); ++app) {
-    if ((*app)->ShouldDisplayInLauncher() &&
-        !IsSpecialApp((*app)->id()) &&
-        MatchesQuery(query, UTF8ToUTF16((*app)->name()))) {
-      items->push_back(new ExtensionAppItem(profile_, *app));
-    }
-  }
-}
-
-void AppListModelBuilder::CreateSpecialItems() {
-  DCHECK(model_ && model_->item_count() == 0);
-
-  model_->AddItem(new ChromeAppItem());
-
-  bool is_guest_session = Profile::IsGuestSession();
-  ExtensionService* service = profile_->GetExtensionService();
-  DCHECK(service);
-  for (size_t i = 0; i < arraysize(kSpecialApps); ++i) {
-    const std::string extension_id(kSpecialApps[i]);
-    if (is_guest_session && extension_id == extension_misc::kWebStoreAppId)
-      continue;
-
-    const Extension* extension = service->GetInstalledExtension(extension_id);
-    DCHECK(extension);
-
-    model_->AddItem(new ExtensionAppItem(profile_, extension));
-  }
-
-  special_items_count_ = model_->item_count();
-}
-
-int AppListModelBuilder::FindApp(const std::string& app_id) {
-  DCHECK(model_);
-  for (size_t i = special_items_count_; i < model_->item_count(); ++i) {
-    ChromeAppListItem* item =
-        static_cast<ChromeAppListItem*>(model_->GetItemAt(i));
-    if (item->type() != ChromeAppListItem::TYPE_APP)
-      continue;
-
-    ExtensionAppItem* extension_item = static_cast<ExtensionAppItem*>(item);
-    if (extension_item->extension_id() == app_id)
-      return i;
-  }
-
-  return -1;
-}
-
-void AppListModelBuilder::HighlightApp() {
-  DCHECK(model_);
-  if (highlight_app_id_.empty())
-    return;
-
-  int index = FindApp(highlight_app_id_);
-  if (index == -1)
-    return;
-
-  model_->GetItemAt(index)->SetHighlighted(true);
-  highlight_app_id_.clear();
-}
-
-void AppListModelBuilder::Observe(int type,
-                                  const content::NotificationSource& source,
-                                  const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED: {
-      const Extension* extension =
-          content::Details<const Extension>(details).ptr();
-      if (!extension->ShouldDisplayInLauncher() ||
-          !MatchesQuery(query_, UTF8ToUTF16(extension->name())))
-        return;
-
-      if (FindApp(extension->id()) != -1)
-        return;
-
-      InsertItemByTitle(new ExtensionAppItem(profile_, extension));
-      HighlightApp();
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
-      const Extension* extension =
-          content::Details<extensions::UnloadedExtensionInfo>(
-              details)->extension;
-      int index = FindApp(extension->id());
-      if (index >= 0)
-        model_->DeleteItemAt(index);
-      break;
-    }
-    case chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST: {
-      highlight_app_id_ = *content::Details<const std::string>(details).ptr();
-      HighlightApp();
-      break;
-    }
-    default:
-      NOTREACHED();
-  }
-}