Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: chrome/browser/dom_ui/options/core_options_handler.cc

Issue 6360016: dom-ui settings: Improve search field behavior.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: rebase Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/core_options_handler.h" 5 #include "chrome/browser/dom_ui/options/core_options_handler.h"
6 6
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 localized_strings->SetString("languagePinyinPage", 54 localized_strings->SetString("languagePinyinPage",
55 l10n_util::GetStringUTF16( 55 l10n_util::GetStringUTF16(
56 IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE)); 56 IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE));
57 #endif 57 #endif
58 localized_strings->SetString("managedPrefsBannerText", 58 localized_strings->SetString("managedPrefsBannerText",
59 l10n_util::GetStringUTF16(IDS_OPTIONS_MANAGED_PREFS)); 59 l10n_util::GetStringUTF16(IDS_OPTIONS_MANAGED_PREFS));
60 60
61 // Search 61 // Search
62 localized_strings->SetString("searchPageTitle", 62 localized_strings->SetString("searchPageTitle",
63 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_TITLE)); 63 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_TITLE));
64 localized_strings->SetString("searchPageInfo",
65 l10n_util::GetStringFUTF16(IDS_OPTIONS_SEARCH_PAGE_INFO,
66 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
67 localized_strings->SetString("searchPageNoMatches", 64 localized_strings->SetString("searchPageNoMatches",
68 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES)); 65 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES));
69 localized_strings->SetString("searchPageHelpLabel", 66 localized_strings->SetString("searchPageHelpLabel",
70 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL)); 67 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL));
71 localized_strings->SetString("searchPageHelpTitle", 68 localized_strings->SetString("searchPageHelpTitle",
72 l10n_util::GetStringFUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_TITLE, 69 l10n_util::GetStringFUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_TITLE,
73 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 70 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
74 localized_strings->SetString("searchPageHelpURL", 71 localized_strings->SetString("searchPageHelpURL",
75 google_util::AppendGoogleLocaleParam( 72 google_util::AppendGoogleLocaleParam(
76 GURL(chrome::kChromeHelpURL)).spec()); 73 GURL(chrome::kChromeHelpURL)).spec());
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 374
378 DictionaryValue* dict = new DictionaryValue; 375 DictionaryValue* dict = new DictionaryValue;
379 dict->Set("value", pref->GetValue()->DeepCopy()); 376 dict->Set("value", pref->GetValue()->DeepCopy());
380 dict->SetBoolean("managed", pref->IsManaged()); 377 dict->SetBoolean("managed", pref->IsManaged());
381 result_value.Append(dict); 378 result_value.Append(dict);
382 379
383 dom_ui_->CallJavascriptFunction(callback_function, result_value); 380 dom_ui_->CallJavascriptFunction(callback_function, result_value);
384 } 381 }
385 } 382 }
386 } 383 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698