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

Side by Side Diff: chrome/browser/ui/webui/flash_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, 8 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
« no previous file with comments | « chrome/browser/ui/webui/flags_ui.cc ('k') | chrome/browser/ui/webui/gpu_internals_ui.cc » ('j') | 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) 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/flash_ui.h" 5 #include "chrome/browser/ui/webui/flash_ui.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/string16.h" 15 #include "base/string16.h"
16 #include "base/string_number_conversions.h" 16 #include "base/string_number_conversions.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/threading/thread_restrictions.h" 18 #include "base/threading/thread_restrictions.h"
19 #include "base/timer.h" 19 #include "base/timer.h"
20 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
21 #include "base/values.h" 21 #include "base/values.h"
22 #include "chrome/browser/crash_upload_list.h" 22 #include "chrome/browser/crash_upload_list.h"
23 #include "chrome/browser/plugin_prefs.h" 23 #include "chrome/browser/plugin_prefs.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
25 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 26 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
26 #include "chrome/browser/ui/webui/crashes_ui.h" 27 #include "chrome/browser/ui/webui/crashes_ui.h"
27 #include "chrome/common/chrome_version_info.h" 28 #include "chrome/common/chrome_version_info.h"
28 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/gpu_data_manager.h" 30 #include "content/public/browser/gpu_data_manager.h"
30 #include "content/public/browser/gpu_data_manager_observer.h" 31 #include "content/public/browser/gpu_data_manager_observer.h"
31 #include "content/public/browser/plugin_service.h" 32 #include "content/public/browser/plugin_service.h"
32 #include "content/public/browser/user_metrics.h" 33 #include "content/public/browser/user_metrics.h"
33 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
34 #include "content/public/browser/web_ui.h" 35 #include "content/public/browser/web_ui.h"
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 /////////////////////////////////////////////////////////////////////////////// 369 ///////////////////////////////////////////////////////////////////////////////
369 370
370 FlashUI::FlashUI(content::WebUI* web_ui) : WebUIController(web_ui) { 371 FlashUI::FlashUI(content::WebUI* web_ui) : WebUIController(web_ui) {
371 content::RecordAction( 372 content::RecordAction(
372 UserMetricsAction("ViewAboutFlash")); 373 UserMetricsAction("ViewAboutFlash"));
373 374
374 web_ui->AddMessageHandler(new FlashDOMHandler()); 375 web_ui->AddMessageHandler(new FlashDOMHandler());
375 376
376 // Set up the about:flash source. 377 // Set up the about:flash source.
377 Profile* profile = Profile::FromWebUI(web_ui); 378 Profile* profile = Profile::FromWebUI(web_ui);
378 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource()); 379 ChromeURLDataManager::AddDataSource(profile, CreateFlashUIHTMLSource());
379 } 380 }
380 381
381 // static 382 // static
382 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { 383 RefCountedMemory* FlashUI::GetFaviconResourceBytes() {
383 // Use the default icon for now. 384 // Use the default icon for now.
384 return NULL; 385 return NULL;
385 } 386 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/flags_ui.cc ('k') | chrome/browser/ui/webui/gpu_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698