| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/importer_view.h" | 5 #include "chrome/browser/views/importer_view.h" | 
| 6 | 6 | 
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" | 
| 8 #include "chrome/browser/browser_list.h" | 8 #include "chrome/browser/browser_list.h" | 
| 9 #include "chrome/browser/browser_window.h" | 9 #include "chrome/browser/browser_window.h" | 
| 10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 48 ImporterView::~ImporterView() { | 48 ImporterView::~ImporterView() { | 
| 49 } | 49 } | 
| 50 | 50 | 
| 51 void ImporterView::SetupControl() { | 51 void ImporterView::SetupControl() { | 
| 52   // Adds all controls. | 52   // Adds all controls. | 
| 53   import_from_label_ = | 53   import_from_label_ = | 
| 54       new views::Label(l10n_util::GetString(IDS_IMPORT_FROM_LABEL)); | 54       new views::Label(l10n_util::GetString(IDS_IMPORT_FROM_LABEL)); | 
| 55 | 55 | 
| 56   profile_combobox_ = new views::Combobox(this); | 56   profile_combobox_ = new views::Combobox(this); | 
| 57   profile_combobox_->set_listener(this); | 57   profile_combobox_->set_listener(this); | 
|  | 58   profile_combobox_->SetAccessibleName(import_from_label_->GetText()); | 
| 58 | 59 | 
| 59   import_items_label_ = | 60   import_items_label_ = | 
| 60       new views::Label(l10n_util::GetString(IDS_IMPORT_ITEMS_LABEL)); | 61       new views::Label(l10n_util::GetString(IDS_IMPORT_ITEMS_LABEL)); | 
| 61 | 62 | 
| 62   history_checkbox_ = | 63   history_checkbox_ = | 
| 63       InitCheckbox(l10n_util::GetString(IDS_IMPORT_HISTORY_CHKBOX), | 64       InitCheckbox(l10n_util::GetString(IDS_IMPORT_HISTORY_CHKBOX), | 
| 64                    (initial_state_ & HISTORY) != 0); | 65                    (initial_state_ & HISTORY) != 0); | 
| 65   favorites_checkbox_ = | 66   favorites_checkbox_ = | 
| 66       InitCheckbox(l10n_util::GetString(IDS_IMPORT_FAVORITES_CHKBOX), | 67       InitCheckbox(l10n_util::GetString(IDS_IMPORT_FAVORITES_CHKBOX), | 
| 67                    (initial_state_ & FAVORITES) != 0); | 68                    (initial_state_ & FAVORITES) != 0); | 
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 253 | 254 | 
| 254   if (favorites_checkbox_->IsEnabled()) | 255   if (favorites_checkbox_->IsEnabled()) | 
| 255     favorites_checkbox_->SetChecked(!!(items & FAVORITES)); | 256     favorites_checkbox_->SetChecked(!!(items & FAVORITES)); | 
| 256 | 257 | 
| 257   if (passwords_checkbox_->IsEnabled()) | 258   if (passwords_checkbox_->IsEnabled()) | 
| 258     passwords_checkbox_->SetChecked(!!(items & PASSWORDS)); | 259     passwords_checkbox_->SetChecked(!!(items & PASSWORDS)); | 
| 259 | 260 | 
| 260   if (search_engines_checkbox_->IsEnabled()) | 261   if (search_engines_checkbox_->IsEnabled()) | 
| 261     search_engines_checkbox_->SetChecked(!!(items & SEARCH_ENGINES)); | 262     search_engines_checkbox_->SetChecked(!!(items & SEARCH_ENGINES)); | 
| 262 } | 263 } | 
| OLD | NEW | 
|---|