Views: Implement the ImporterList::Observer in ImporterView to enable the

chrome/browser/ui/views/importer_view.cc

 // Copyright (c) 2010 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/importer_view.h"
 
 #include "app/l10n_util.h"
-#include "base/string16.h"
+#include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
@@ skipping 16 matching lines @@
 
 ImporterView::ImporterView(Profile* profile, int initial_state)
     : import_from_label_(NULL),
       profile_combobox_(NULL),
       import_items_label_(NULL),
       history_checkbox_(NULL),
       favorites_checkbox_(NULL),
       passwords_checkbox_(NULL),
       search_engines_checkbox_(NULL),
       profile_(profile),
-      importer_host_(new ImporterHost()),
+      ALLOW_THIS_IN_INITIALIZER_LIST(importer_host_(new ImporterHost(this))),
       initial_state_(initial_state) {
   DCHECK(profile);
   SetupControl();
 }
 
 ImporterView::~ImporterView() {
 }
 
 void ImporterView::SetupControl() {
   // Adds all controls.
@@ skipping 116 matching lines @@
 
 void ImporterView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   // When no checkbox is checked we should disable the "Import" button.
   // This forces the button to evaluate what state they should be in.
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 int ImporterView::GetItemCount() {
   DCHECK(importer_host_.get());
-  int item_count = importer_host_->GetAvailableProfileCount();
-  if (checkbox_items_.size() < static_cast<size_t>(item_count))
-    checkbox_items_.resize(item_count, initial_state_);
+
+  int item_count;

[sky, 2010/12/16 23:07:22]

This code should live in SourceProfilesLoaded, and this should just return
checkbox_items.size().

[James Hawkins, 2010/12/16 23:32:13]

Done.

+  if (!importer_host_->source_profiles_loaded()) {
+    item_count = 1;
+  } else {
+    item_count = importer_host_->GetAvailableProfileCount();
+
+    if (checkbox_items_.size() < static_cast<size_t>(item_count))
+      checkbox_items_.resize(item_count, initial_state_);
+  }
+
   return item_count;
 }
 
 string16 ImporterView::GetItemAt(int index) {
   DCHECK(importer_host_.get());
-  return WideToUTF16Hack(importer_host_->GetSourceProfileNameAt(index));
+
+  if (!importer_host_->source_profiles_loaded())
+    return l10n_util::GetStringUTF16(IDS_IMPORT_LOADING_PROFILES);
+  else
+    return WideToUTF16Hack(importer_host_->GetSourceProfileNameAt(index));
 }
 
 void ImporterView::ItemChanged(views::Combobox* combobox,
                                int prev_index, int new_index) {
   DCHECK(combobox);
   DCHECK(checkbox_items_.size() >=
       static_cast<size_t>(importer_host_->GetAvailableProfileCount()));
 
   if (prev_index == new_index)
     return;
 
   // Save the current state
   uint16 prev_items = GetCheckedItems();
   checkbox_items_[prev_index] = prev_items;
 
   // Enable/Disable the checkboxes for this Item
   uint16 new_enabled_items = importer_host_->GetSourceProfileInfoAt(
       new_index).services_supported;
   SetCheckedItemsState(new_enabled_items);
 
   // Set the checked items for this Item
   uint16 new_items = checkbox_items_[new_index];
   SetCheckedItems(new_items);
 }
 
+void ImporterView::SourceProfilesLoaded() {
+  // Reload the profile combobox.
+  profile_combobox_->ModelChanged();
+}
+
 void ImporterView::ImportCanceled() {
   ImportComplete();
 }
 
 void ImporterView::ImportComplete() {
   // Now close this window since the import completed or was canceled.
   window()->Close();
 }
 
 views::Checkbox* ImporterView::InitCheckbox(const std::wstring& text,
@@ skipping 52 matching lines @@
   if (favorites_checkbox_->IsEnabled())
     favorites_checkbox_->SetChecked(!!(items & importer::FAVORITES));
 
   if (passwords_checkbox_->IsEnabled())
     passwords_checkbox_->SetChecked(!!(items & importer::PASSWORDS));
 
   if (search_engines_checkbox_->IsEnabled())
     search_engines_checkbox_->SetChecked(!!(items &
                                             importer::SEARCH_ENGINES));
 }