Make Combobox portable

chrome/browser/views/bookmark_bubble_view.cc

 // Copyright (c) 2006-2008 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/views/bookmark_bubble_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/standard_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/textfield/textfield.h"
 
-using views::ComboBox;
+using views::Combobox;
 using views::ColumnSet;
 using views::GridLayout;
 using views::Label;
 using views::Link;
 using views::NativeButton;
 using views::View;
 
 // Color of the title.
 static const SkColor kTitleColor = SkColorSetRGB(6, 45, 117);
 
@@ skipping 64 matching lines @@
 
   // And put the bookmark bar and other nodes at the end of the list.
   nodes_.push_back(bb_model->GetBookmarkBarNode());
   nodes_.push_back(bb_model->other_node());
 
   node_parent_index_ = static_cast<int>(
       find(nodes_.begin(), nodes_.end(), node->GetParent()) - nodes_.begin());
 }
 
 int BookmarkBubbleView::RecentlyUsedFoldersModel::GetItemCount(
-    ComboBox* source) {
+    Combobox* source) {
   return static_cast<int>(nodes_.size() + 1);
 }
 
 std::wstring BookmarkBubbleView::RecentlyUsedFoldersModel::GetItemAt(
-    ComboBox* source, int index) {
+    Combobox* source, int index) {
   if (index == nodes_.size())
     return l10n_util::GetString(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
   return nodes_[index]->GetTitle();
 }
 
 BookmarkNode* BookmarkBubbleView::RecentlyUsedFoldersModel::GetNodeAt(
     int index) {
   return nodes_[index];
 }
 
@@ skipping 102 matching lines @@
   remove_link_ = new Link(l10n_util::GetString(
       IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK));
   remove_link_->SetController(this);
 
   edit_button_ = new NativeButton(
       this, l10n_util::GetString(IDS_BOOMARK_BUBBLE_OPTIONS));
 
   close_button_ = new NativeButton(this, l10n_util::GetString(IDS_CLOSE));
   close_button_->SetIsDefault(true);
 
-  parent_combobox_ = new ComboBox(&parent_model_);
+  parent_combobox_ = new Combobox(&parent_model_);
   parent_combobox_->SetSelectedItem(parent_model_.node_parent_index());
-  parent_combobox_->SetListener(this);
+  parent_combobox_->set_listener(this);
 
   Label* title_label = new Label(l10n_util::GetString(
       newly_bookmarked_ ? IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED :
                           IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK));
   title_label->SetFont(
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
   title_label->SetColor(kTitleColor);
 
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
@@ skipping 77 matching lines @@
   DCHECK(source == remove_link_);
   UserMetrics::RecordAction(L"BookmarkBubble_Unstar", profile_);
 
   // Set this so we remove the bookmark after the window closes.
   remove_bookmark_ = true;
   apply_edits_ = false;
 
   Close();
 }
 
-void BookmarkBubbleView::ItemChanged(ComboBox* combo_box,
+void BookmarkBubbleView::ItemChanged(Combobox* combobox,
                                      int prev_index,
                                      int new_index) {
   if (new_index + 1 == parent_model_.GetItemCount(parent_combobox_)) {
     UserMetrics::RecordAction(L"BookmarkBubble_EditFromCombobox", profile_);
 
     ShowEditor();
     return;
   }
 }
 
@@ skipping 62 matching lines @@
   BookmarkModel* model = profile_->GetBookmarkModel();
   BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
     const std::wstring new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble",
                                 profile_);
     }
     // Last index means 'Choose another folder...'
-    if (parent_combobox_->GetSelectedItem() <
+    if (parent_combobox_->selected_item() <
         parent_model_.GetItemCount(parent_combobox_) - 1) {
       BookmarkNode* new_parent =
-          parent_model_.GetNodeAt(parent_combobox_->GetSelectedItem());
+          parent_model_.GetNodeAt(parent_combobox_->selected_item());
       if (new_parent != node->GetParent()) {
         UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent", profile_);
         model->Move(node, new_parent, new_parent->GetChildCount());
       }
     }
   }
 }