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

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

Issue 3032006: Revert 52795 - Fix chromeos compile.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 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 | « 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/options_ui.h" 5 #include "chrome/browser/dom_ui/options_ui.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
(...skipping 27 matching lines...) Expand all
38 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
39 #include "grit/locale_settings.h" 39 #include "grit/locale_settings.h"
40 #include "grit/theme_resources.h" 40 #include "grit/theme_resources.h"
41 41
42 #if defined(OS_CHROMEOS) 42 #if defined(OS_CHROMEOS)
43 #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h" 43 #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h"
44 #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h" 44 #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h"
45 #include "chrome/browser/chromeos/dom_ui/labs_handler.h" 45 #include "chrome/browser/chromeos/dom_ui/labs_handler.h"
46 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h" 46 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
47 #include "chrome/browser/chromeos/dom_ui/language_options_handler.h" 47 #include "chrome/browser/chromeos/dom_ui/language_options_handler.h"
48 #include "chrome/browser/chromeos/dom_ui/sync_options_handler.h"
48 #include "chrome/browser/chromeos/dom_ui/system_options_handler.h" 49 #include "chrome/browser/chromeos/dom_ui/system_options_handler.h"
49 #endif 50 #endif
50 51
51 //////////////////////////////////////////////////////////////////////////////// 52 ////////////////////////////////////////////////////////////////////////////////
52 // 53 //
53 // OptionsUIHTMLSource 54 // OptionsUIHTMLSource
54 // 55 //
55 //////////////////////////////////////////////////////////////////////////////// 56 ////////////////////////////////////////////////////////////////////////////////
56 57
57 OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings) 58 OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings)
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 (static_cast<OptionsPageUIHandler*>(*iter))->Initialize(); 157 (static_cast<OptionsPageUIHandler*>(*iter))->Initialize();
157 } 158 }
158 } 159 }
159 160
160 void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings, 161 void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
161 OptionsPageUIHandler* handler) { 162 OptionsPageUIHandler* handler) {
162 DCHECK(handler); 163 DCHECK(handler);
163 handler->GetLocalizedValues(localized_strings); 164 handler->GetLocalizedValues(localized_strings);
164 AddMessageHandler(handler->Attach(this)); 165 AddMessageHandler(handler->Attach(this));
165 } 166 }
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