Modify extension omnibox keywords to be user-configurable

chrome/browser/ui/search_engines/template_url_table_model.cc

 // 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/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 10 matching lines @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
 
 // Group IDs used by TemplateURLTableModel.
 static const int kMainGroupID = 0;
 static const int kOtherGroupID = 1;
+static const int kExtensionGroupID = 2;
 
 // ModelEntry ----------------------------------------------------
 
 // ModelEntry wraps a TemplateURL as returned from the TemplateURL.
 // ModelEntry also tracks state information about the URL.
 
 // Icon used while loading, or if a specific favicon can't be found.
 static gfx::ImageSkia* default_icon = NULL;
 
 class ModelEntry {
@@ skipping 95 matching lines @@
   entries_.clear();
 }
 
 void TemplateURLTableModel::Reload() {
   STLDeleteElements(&entries_);
   entries_.clear();
 
   TemplateURLService::TemplateURLVector urls =
       template_url_service_->GetTemplateURLs();
 
   // Keywords that can be made the default first.

[Peter Kasting, 2013/05/30 21:22:50]

Nit: Since you have the same block of code three times, what about something
like:

...
for (...) {
  ...
  if (template_url->show_in_default_list())
    default_entries.push_back(...);
  else if (template_url->IsExtensionKeyword())
    extension_entries.push_back(...);
  else
    other_entries.push_back(...);
}

Then you can construct |entries_| by just appending the vectors together, and
their sizes give you the indexes you want.

(You could also elect to replace |entries_| with three separate vectors like
this and do operations on them directly, but I don't know whether that'd be a
win.)

[Aaron Jacobs, 2013/05/31 03:07:24]

Done.

   for (TemplateURLService::TemplateURLVector::iterator i = urls.begin();
        i != urls.end(); ++i) {
     TemplateURL* template_url = *i;
     // NOTE: we don't use ShowInDefaultList here to avoid items bouncing around
     // the lists while editing.
     if (template_url->show_in_default_list())
       entries_.push_back(new ModelEntry(this, template_url));
   }
 
   last_search_engine_index_ = static_cast<int>(entries_.size());
 
-  // Then the rest.
+  // Then the non extension keywords.
   for (TemplateURLService::TemplateURLVector::iterator i = urls.begin();
        i != urls.end(); ++i) {
     TemplateURL* template_url = *i;
     // NOTE: we don't use ShowInDefaultList here to avoid things bouncing
     // the lists while editing.
     if (!template_url->show_in_default_list() &&
         !template_url->IsExtensionKeyword()) {
       entries_.push_back(new ModelEntry(this, template_url));
     }
   }
 
+  last_other_engine_index_ = static_cast<int>(entries_.size());
+
+  // Finally, the extensions.
+  for (TemplateURLService::TemplateURLVector::iterator i = urls.begin();
+       i != urls.end(); ++i) {
+    TemplateURL* template_url = *i;
+    // NOTE: we don't use ShowInDefaultList here to avoid things bouncing
+    // the lists while editing.
+    if (!template_url->show_in_default_list() &&
+        template_url->IsExtensionKeyword()) {
+      entries_.push_back(new ModelEntry(this, template_url));
+    }
+  }
+
   if (observer_)
     observer_->OnModelChanged();
 }
 
 int TemplateURLTableModel::RowCount() {
   return static_cast<int>(entries_.size());
 }
 
 string16 TemplateURLTableModel::GetText(int row, int col_id) {
   DCHECK(row >= 0 && row < RowCount());
@@ skipping 35 matching lines @@
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_MAIN_SEPARATOR);
   search_engine_group.id = kMainGroupID;
   groups.push_back(search_engine_group);
 
   Group other_group;
   other_group.title =
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_OTHER_SEPARATOR);
   other_group.id = kOtherGroupID;
   groups.push_back(other_group);
 
+  Group extension_group;
+  extension_group.title =
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_EXTENSIONS_SEPARATOR);
+  extension_group.id = kExtensionGroupID;
+  groups.push_back(extension_group);
+
   return groups;
 }
 
 int TemplateURLTableModel::GetGroupID(int row) {
   DCHECK(row >= 0 && row < RowCount());
-  return row < last_search_engine_index_ ? kMainGroupID : kOtherGroupID;
+  if (row < last_search_engine_index_)
+    return kMainGroupID;
+  if (row < last_other_engine_index_)

[Peter Kasting, 2013/05/30 21:22:50]

Nit: You could use ?: on this last pair

[Aaron Jacobs, 2013/05/31 03:07:24]

Done.

+    return kOtherGroupID;
+  return kExtensionGroupID;
 }
 
 void TemplateURLTableModel::Remove(int index) {
   // Remove the observer while we modify the model, that way we don't need to
   // worry about the model calling us back when we mutate it.
   template_url_service_->RemoveObserver(this);
   TemplateURL* template_url = GetTemplateURL(index);
 
   scoped_ptr<ModelEntry> entry(entries_[index]);
   entries_.erase(entries_.begin() + index);
   if (index < last_search_engine_index_)
-    last_search_engine_index_--;
+    --last_search_engine_index_;
+  if (index < last_other_engine_index_)
+    --last_other_engine_index_;
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
 
   // Make sure to remove from the table model first, otherwise the
   // TemplateURL would be freed.
   template_url_service_->Remove(template_url);
   template_url_service_->AddObserver(this);
 }
 
 void TemplateURLTableModel::Add(int index,
@@ skipping 113 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }