chrome/browser/ui/webui/chromeos/system_info_ui.cc - Issue 12049052: Move core url data manager classes to content.

Side by Side Diff: chrome/browser/ui/webui/chromeos/system_info_ui.cc

Issue 12049052: Move core url data manager classes to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: review comments Created 7 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/browser/ui/webui/chromeos/sim_unlock_ui.cc ('k') | chrome/browser/ui/webui/devtools_ui.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/ui/webui/chromeos/system_info_ui.h"	5 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/memory/ref_counted_memory.h"	9 #include "base/memory/ref_counted_memory.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/memory/weak_ptr.h"	11 #include "base/memory/weak_ptr.h"

12 #include "base/message_loop.h"	12 #include "base/message_loop.h"

13 #include "base/path_service.h"	13 #include "base/path_service.h"

14 #include "base/string_piece.h"	14 #include "base/string_piece.h"

15 #include "base/string_util.h"	15 #include "base/string_util.h"

16 #include "base/synchronization/waitable_event.h"	16 #include "base/synchronization/waitable_event.h"

17 #include "base/threading/thread.h"	17 #include "base/threading/thread.h"

18 #include "base/time.h"	18 #include "base/time.h"

19 #include "base/utf_string_conversions.h"	19 #include "base/utf_string_conversions.h"

20 #include "base/values.h"	20 #include "base/values.h"

21 #include "chrome/browser/chromeos/cros/cros_library.h"	21 #include "chrome/browser/chromeos/cros/cros_library.h"

22 #include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"	22 #include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"

23 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

	24 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

24 #include "chrome/common/chrome_paths.h"	25 #include "chrome/common/chrome_paths.h"

25 #include "chrome/common/url_constants.h"	26 #include "chrome/common/url_constants.h"

26 #include "content/public/browser/url_data_source.h"	27 #include "content/public/browser/url_data_source.h"

27 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

28 #include "content/public/browser/web_ui.h"	29 #include "content/public/browser/web_ui.h"

29 #include "content/public/browser/web_ui_message_handler.h"	30 #include "content/public/browser/web_ui_message_handler.h"

30 #include "grit/browser_resources.h"	31 #include "grit/browser_resources.h"

31 #include "grit/chromium_strings.h"	32 #include "grit/chromium_strings.h"

32 #include "grit/generated_resources.h"	33 #include "grit/generated_resources.h"

33 #include "grit/locale_settings.h"	34 #include "grit/locale_settings.h"

(...skipping 152 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
186 SystemInfoHandler* handler = new SystemInfoHandler();	187 SystemInfoHandler* handler = new SystemInfoHandler();

187 web_ui->AddMessageHandler(handler);	188 web_ui->AddMessageHandler(handler);

188 SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();	189 SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();

189	190

190 // Set up the chrome://system/ source.	191 // Set up the chrome://system/ source.

191 Profile* profile = Profile::FromWebUI(web_ui);	192 Profile* profile = Profile::FromWebUI(web_ui);

192 ChromeURLDataManager::AddDataSource(profile, html_source);	193 ChromeURLDataManager::AddDataSource(profile, html_source);

193 }	194 }

194	195

195 } // namespace chromeos	196 } // namespace chromeos

OLD	NEW