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

Side by Side Diff: chrome/browser/dom_ui/flags_ui.cc

Issue 3795009: Fix DCHECK caused by passing a parameter to a string that doesn't have a placeholder. (Closed)
Patch Set: Created 10 years, 2 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
« no previous file with comments | « no previous file | no next file » | 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/flags_ui.h" 5 #include "chrome/browser/dom_ui/flags_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // Strings used in the JsTemplate file. 59 // Strings used in the JsTemplate file.
60 DictionaryValue localized_strings; 60 DictionaryValue localized_strings;
61 localized_strings.SetString("flagsLongTitle", 61 localized_strings.SetString("flagsLongTitle",
62 l10n_util::GetStringUTF16(IDS_FLAGS_LONG_TITLE)); 62 l10n_util::GetStringUTF16(IDS_FLAGS_LONG_TITLE));
63 localized_strings.SetString("flagsTableTitle", 63 localized_strings.SetString("flagsTableTitle",
64 l10n_util::GetStringUTF16(IDS_FLAGS_TABLE_TITLE)); 64 l10n_util::GetStringUTF16(IDS_FLAGS_TABLE_TITLE));
65 localized_strings.SetString("flagsNoExperimentsAvailable", 65 localized_strings.SetString("flagsNoExperimentsAvailable",
66 l10n_util::GetStringUTF16(IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE)); 66 l10n_util::GetStringUTF16(IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE));
67 localized_strings.SetString("flagsWarningHeader", l10n_util::GetStringUTF16( 67 localized_strings.SetString("flagsWarningHeader", l10n_util::GetStringUTF16(
68 IDS_FLAGS_WARNING_HEADER)); 68 IDS_FLAGS_WARNING_HEADER));
69 localized_strings.SetString("flagsBlurb", l10n_util::GetStringFUTF16( 69 localized_strings.SetString("flagsBlurb", l10n_util::GetStringUTF16(
70 IDS_FLAGS_WARNING_TEXT, 70 IDS_FLAGS_WARNING_TEXT));
71 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
72 localized_strings.SetString("flagsRestartNotice", l10n_util::GetStringFUTF16( 71 localized_strings.SetString("flagsRestartNotice", l10n_util::GetStringFUTF16(
73 IDS_FLAGS_RESTART_NOTICE, 72 IDS_FLAGS_RESTART_NOTICE,
74 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 73 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
75 localized_strings.SetString("flagsRestartButton", 74 localized_strings.SetString("flagsRestartButton",
76 l10n_util::GetStringUTF16(IDS_FLAGS_RESTART_BUTTON)); 75 l10n_util::GetStringUTF16(IDS_FLAGS_RESTART_BUTTON));
77 localized_strings.SetString("disable", 76 localized_strings.SetString("disable",
78 l10n_util::GetStringUTF16(IDS_FLAGS_DISABLE)); 77 l10n_util::GetStringUTF16(IDS_FLAGS_DISABLE));
79 localized_strings.SetString("enable", 78 localized_strings.SetString("enable",
80 l10n_util::GetStringUTF16(IDS_FLAGS_ENABLE)); 79 l10n_util::GetStringUTF16(IDS_FLAGS_ENABLE));
81 80
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // static 191 // static
193 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() { 192 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
194 return ResourceBundle::GetSharedInstance(). 193 return ResourceBundle::GetSharedInstance().
195 LoadDataResourceBytes(IDR_FLAGS); 194 LoadDataResourceBytes(IDR_FLAGS);
196 } 195 }
197 196
198 // static 197 // static
199 void FlagsUI::RegisterUserPrefs(PrefService* prefs) { 198 void FlagsUI::RegisterUserPrefs(PrefService* prefs) {
200 prefs->RegisterListPref(prefs::kEnabledLabsExperiments); 199 prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
201 } 200 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698