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

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

Issue 9241032: Switch chrome code to use content::WebUI interface instead of WebUI concrete class. The latter wi... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/chromeos/system/statistics_provider.h" 16 #include "chrome/browser/chromeos/system/statistics_provider.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h" 18 #include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h"
19 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 19 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
20 #include "chrome/common/jstemplate_builder.h" 20 #include "chrome/common/jstemplate_builder.h"
21 #include "chrome/common/time_format.h" 21 #include "chrome/common/time_format.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "content/browser/webui/web_ui.h"
24 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "content/public/browser/web_ui.h"
26 #include "grit/browser_resources.h" 26 #include "grit/browser_resources.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/locale_settings.h" 28 #include "grit/locale_settings.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/base/text/bytes_formatting.h" 31 #include "ui/base/text/bytes_formatting.h"
32 32
33 using content::BrowserThread; 33 using content::BrowserThread;
34 using content::DownloadItem; 34 using content::DownloadItem;
35 using content::WebContents; 35 using content::WebContents;
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 } 638 }
639 639
640 } // namespace imageburner. 640 } // namespace imageburner.
641 641
642 //////////////////////////////////////////////////////////////////////////////// 642 ////////////////////////////////////////////////////////////////////////////////
643 // 643 //
644 // ImageBurnUI 644 // ImageBurnUI
645 // 645 //
646 //////////////////////////////////////////////////////////////////////////////// 646 ////////////////////////////////////////////////////////////////////////////////
647 647
648 ImageBurnUI::ImageBurnUI(WebUI* web_ui) : WebUIController(web_ui) { 648 ImageBurnUI::ImageBurnUI(content::WebUI* web_ui) : WebUIController(web_ui) {
649 WebContents* contents = web_ui->web_contents(); 649 imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(
650 imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(contents); 650 web_ui->GetWebContents());
651 web_ui->AddMessageHandler(handler); 651 web_ui->AddMessageHandler(handler);
652 652
653 Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); 653 Profile* profile = Profile::FromWebUI(web_ui);
654 profile->GetChromeURLDataManager()->AddDataSource( 654 profile->GetChromeURLDataManager()->AddDataSource(
655 CreateImageburnerUIHTMLSource()); 655 CreateImageburnerUIHTMLSource());
656 } 656 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698