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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
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/options_ui.h" 5 #include "chrome/browser/dom_ui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/singleton.h" 14 #include "base/singleton.h"
15 #include "base/string_piece.h" 15 #include "base/string_piece.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/thread.h" 17 #include "base/threading/thread.h"
18 #include "base/time.h" 18 #include "base/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/browser_about_handler.h" 20 #include "chrome/browser/browser_about_handler.h"
21 #include "chrome/browser/browser_thread.h" 21 #include "chrome/browser/browser_thread.h"
22 #include "chrome/browser/dom_ui/dom_ui_theme_source.h" 22 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
23 #include "chrome/browser/dom_ui/options/about_page_handler.h" 23 #include "chrome/browser/dom_ui/options/about_page_handler.h"
24 #include "chrome/browser/dom_ui/options/add_startup_page_handler.h" 24 #include "chrome/browser/dom_ui/options/add_startup_page_handler.h"
25 #include "chrome/browser/dom_ui/options/advanced_options_handler.h" 25 #include "chrome/browser/dom_ui/options/advanced_options_handler.h"
26 #include "chrome/browser/dom_ui/options/autofill_options_handler.h" 26 #include "chrome/browser/dom_ui/options/autofill_options_handler.h"
27 #include "chrome/browser/dom_ui/options/browser_options_handler.h" 27 #include "chrome/browser/dom_ui/options/browser_options_handler.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 OptionsPageUIHandler* handler_raw) { 272 OptionsPageUIHandler* handler_raw) {
273 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); 273 scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
274 DCHECK(handler.get()); 274 DCHECK(handler.get());
275 // Add only if handler's service is enabled. 275 // Add only if handler's service is enabled.
276 if (handler->IsEnabled()) { 276 if (handler->IsEnabled()) {
277 handler->GetLocalizedValues(localized_strings); 277 handler->GetLocalizedValues(localized_strings);
278 // Add handler to the list and also pass the ownership. 278 // Add handler to the list and also pass the ownership.
279 AddMessageHandler(handler.release()->Attach(this)); 279 AddMessageHandler(handler.release()->Attach(this));
280 } 280 }
281 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/import_data_handler.cc ('k') | chrome/browser/dom_ui/shared_resources_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698