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

Side by Side Diff: chrome/browser/ui/webui/tracing_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
OLDNEW
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/tracing_ui.h" 5 #include "chrome/browser/ui/webui/tracing_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/debug/trace_event.h" 12 #include "base/debug/trace_event.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/gpu_blacklist.h" 17 #include "chrome/browser/gpu_blacklist.h"
18 #include "chrome/browser/gpu_util.h" 18 #include "chrome/browser/gpu_util.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/select_file_dialog.h" 20 #include "chrome/browser/ui/select_file_dialog.h"
21 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
21 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 22 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
22 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
23 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
24 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/gpu_data_manager.h" 26 #include "content/public/browser/gpu_data_manager.h"
26 #include "content/public/browser/gpu_data_manager_observer.h" 27 #include "content/public/browser/gpu_data_manager_observer.h"
27 #include "content/public/browser/render_view_host.h" 28 #include "content/public/browser/render_view_host.h"
28 #include "content/public/browser/trace_controller.h" 29 #include "content/public/browser/trace_controller.h"
29 #include "content/public/browser/trace_subscriber.h" 30 #include "content/public/browser/trace_subscriber.h"
30 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 //////////////////////////////////////////////////////////////////////////////// 478 ////////////////////////////////////////////////////////////////////////////////
478 // 479 //
479 // TracingUI 480 // TracingUI
480 // 481 //
481 //////////////////////////////////////////////////////////////////////////////// 482 ////////////////////////////////////////////////////////////////////////////////
482 483
483 TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) { 484 TracingUI::TracingUI(content::WebUI* web_ui) : WebUIController(web_ui) {
484 web_ui->AddMessageHandler(new TracingMessageHandler()); 485 web_ui->AddMessageHandler(new TracingMessageHandler());
485 486
486 // Set up the chrome://tracing/ source. 487 // Set up the chrome://tracing/ source.
487 Profile::FromWebUI(web_ui)-> 488 Profile* profile = Profile::FromWebUI(web_ui);
488 GetChromeURLDataManager()->AddDataSource(CreateTracingHTMLSource()); 489 ChromeURLDataManager::AddDataSource(profile, CreateTracingHTMLSource());
489 } 490 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/task_manager/task_manager_ui.cc ('k') | chrome/browser/ui/webui/uber/uber_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698