chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc - Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

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

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Made ChromeURLDataManager's destructor virtual Created 8 years, 7 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

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/imageburner/imageburner_ui.h"	5 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"

6	6

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

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

9 #include "base/i18n/rtl.h"	9 #include "base/i18n/rtl.h"

10 #include "base/string16.h"	10 #include "base/string16.h"

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

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

13 #include "chrome/browser/chromeos/imageburner/burn_controller.h"	13 #include "chrome/browser/chromeos/imageburner/burn_controller.h"

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

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

15 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"	16 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

16 #include "chrome/common/time_format.h"	17 #include "chrome/common/time_format.h"

17 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

18 #include "content/public/browser/web_ui.h"	19 #include "content/public/browser/web_ui.h"

19 #include "content/public/browser/web_ui_message_handler.h"	20 #include "content/public/browser/web_ui_message_handler.h"

20 #include "grit/browser_resources.h"	21 #include "grit/browser_resources.h"

21 #include "grit/generated_resources.h"	22 #include "grit/generated_resources.h"

22 #include "googleurl/src/gurl.h"	23 #include "googleurl/src/gurl.h"

23 #include "ui/base/l10n/l10n_util.h"	24 #include "ui/base/l10n/l10n_util.h"

24 #include "ui/base/text/bytes_formatting.h"	25 #include "ui/base/text/bytes_formatting.h"

(...skipping 296 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
321 // ImageBurnUI	322 // ImageBurnUI

322 //	323 //

323 ////////////////////////////////////////////////////////////////////////////////	324 ////////////////////////////////////////////////////////////////////////////////

324	325

325 ImageBurnUI::ImageBurnUI(content::WebUI* web_ui) : WebUIController(web_ui) {	326 ImageBurnUI::ImageBurnUI(content::WebUI* web_ui) : WebUIController(web_ui) {

326 chromeos::imageburner::WebUIHandler* handler =	327 chromeos::imageburner::WebUIHandler* handler =

327 new chromeos::imageburner::WebUIHandler(web_ui->GetWebContents());	328 new chromeos::imageburner::WebUIHandler(web_ui->GetWebContents());

328 web_ui->AddMessageHandler(handler);	329 web_ui->AddMessageHandler(handler);

329	330

330 Profile* profile = Profile::FromWebUI(web_ui);	331 Profile* profile = Profile::FromWebUI(web_ui);

331 profile->GetChromeURLDataManager()->AddDataSource(	332 ChromeURLDataManager::AddDataSource(profile,

332 chromeos::imageburner::CreateImageburnerUIHTMLSource());	333 chromeos::imageburner::CreateImageburnerUIHTMLSource());

333 }	334 }

OLD	NEW