| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/options/browser_options_handler.h" | 5 #include "chrome/browser/dom_ui/options/browser_options_handler.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "base/singleton.h" | 10 #include "base/singleton.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 l10n_util::GetStringUTF16(IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON)); | 70 l10n_util::GetStringUTF16(IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON)); |
| 71 localized_strings->SetString("defaultSearchGroupName", | 71 localized_strings->SetString("defaultSearchGroupName", |
| 72 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME)); | 72 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME)); |
| 73 localized_strings->SetString("defaultSearchManageEngines", | 73 localized_strings->SetString("defaultSearchManageEngines", |
| 74 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES)); | 74 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES)); |
| 75 localized_strings->SetString("instantName", | 75 localized_strings->SetString("instantName", |
| 76 l10n_util::GetStringUTF16(IDS_INSTANT_PREF)); | 76 l10n_util::GetStringUTF16(IDS_INSTANT_PREF)); |
| 77 localized_strings->SetString("instantWarningText", | 77 localized_strings->SetString("instantWarningText", |
| 78 l10n_util::GetStringUTF16(IDS_INSTANT_PREF_WARNING)); | 78 l10n_util::GetStringUTF16(IDS_INSTANT_PREF_WARNING)); |
| 79 localized_strings->SetString("instantLearnMoreLink", | 79 localized_strings->SetString("instantLearnMoreLink", |
| 80 ASCIIToUTF16(browser::kInstantLearnMoreURL)); | 80 ASCIIToUTF16(browser::InstantLearnMoreURL().spec())); |
| 81 localized_strings->SetString("instantConfirmTitle", | 81 localized_strings->SetString("instantConfirmTitle", |
| 82 l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_TITLE)); | 82 l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_TITLE)); |
| 83 localized_strings->SetString("instantConfirmMessage", | 83 localized_strings->SetString("instantConfirmMessage", |
| 84 l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE)); | 84 l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE)); |
| 85 localized_strings->SetString("defaultBrowserGroupName", | 85 localized_strings->SetString("defaultBrowserGroupName", |
| 86 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME)); | 86 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME)); |
| 87 localized_strings->SetString("defaultBrowserUnknown", | 87 localized_strings->SetString("defaultBrowserUnknown", |
| 88 l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, | 88 l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, |
| 89 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 89 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 90 localized_strings->SetString("defaultBrowserUseAsDefault", | 90 localized_strings->SetString("defaultBrowserUseAsDefault", |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 } | 351 } |
| 352 | 352 |
| 353 void BrowserOptionsHandler::SaveStartupPagesPref() { | 353 void BrowserOptionsHandler::SaveStartupPagesPref() { |
| 354 PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); | 354 PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); |
| 355 | 355 |
| 356 SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs); | 356 SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs); |
| 357 pref.urls = startup_custom_pages_table_model_->GetURLs(); | 357 pref.urls = startup_custom_pages_table_model_->GetURLs(); |
| 358 | 358 |
| 359 SessionStartupPref::SetStartupPref(prefs, pref); | 359 SessionStartupPref::SetStartupPref(prefs, pref); |
| 360 } | 360 } |
| OLD | NEW |