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

Side by Side Diff: chrome/browser/task_manager/task_manager.cc

Issue 552703002: Fix compilation on Windows with enable_printing=2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mon Sep 8 17:26:04 PDT 2014 Created 6 years, 3 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/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/number_formatting.h" 8 #include "base/i18n/number_formatting.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 AddResourceProvider( 245 AddResourceProvider(
246 new task_manager::BrowserProcessResourceProvider(task_manager)); 246 new task_manager::BrowserProcessResourceProvider(task_manager));
247 AddResourceProvider(new task_manager::WebContentsResourceProvider( 247 AddResourceProvider(new task_manager::WebContentsResourceProvider(
248 task_manager, 248 task_manager,
249 scoped_ptr<WebContentsInformation>( 249 scoped_ptr<WebContentsInformation>(
250 new task_manager::BackgroundInformation()))); 250 new task_manager::BackgroundInformation())));
251 AddResourceProvider(new task_manager::WebContentsResourceProvider( 251 AddResourceProvider(new task_manager::WebContentsResourceProvider(
252 task_manager, 252 task_manager,
253 scoped_ptr<WebContentsInformation>( 253 scoped_ptr<WebContentsInformation>(
254 new task_manager::TabContentsInformation()))); 254 new task_manager::TabContentsInformation())));
255 #if defined(ENABLE_FULL_PRINTING)
255 AddResourceProvider(new task_manager::WebContentsResourceProvider( 256 AddResourceProvider(new task_manager::WebContentsResourceProvider(
256 task_manager, 257 task_manager,
257 scoped_ptr<WebContentsInformation>( 258 scoped_ptr<WebContentsInformation>(
258 new task_manager::PrintingInformation()))); 259 new task_manager::PrintingInformation())));
260 #endif // ENABLE_FULL_PRINTING
259 AddResourceProvider(new task_manager::WebContentsResourceProvider( 261 AddResourceProvider(new task_manager::WebContentsResourceProvider(
260 task_manager, 262 task_manager,
261 scoped_ptr<WebContentsInformation>( 263 scoped_ptr<WebContentsInformation>(
262 new task_manager::PanelInformation()))); 264 new task_manager::PanelInformation())));
263 AddResourceProvider( 265 AddResourceProvider(
264 new task_manager::ChildProcessResourceProvider(task_manager)); 266 new task_manager::ChildProcessResourceProvider(task_manager));
265 AddResourceProvider(new task_manager::WebContentsResourceProvider( 267 AddResourceProvider(new task_manager::WebContentsResourceProvider(
266 task_manager, 268 task_manager,
267 scoped_ptr<WebContentsInformation>( 269 scoped_ptr<WebContentsInformation>(
268 new task_manager::ExtensionInformation()))); 270 new task_manager::ExtensionInformation())));
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 params.host_desktop_type = desktop_type; 1546 params.host_desktop_type = desktop_type;
1545 chrome::Navigate(&params); 1547 chrome::Navigate(&params);
1546 } 1548 }
1547 1549
1548 TaskManager::TaskManager() 1550 TaskManager::TaskManager()
1549 : model_(new TaskManagerModel(this)) { 1551 : model_(new TaskManagerModel(this)) {
1550 } 1552 }
1551 1553
1552 TaskManager::~TaskManager() { 1554 TaskManager::~TaskManager() {
1553 } 1555 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/chrome_metrics_service_client.cc ('k') | chrome/browser/ui/location_bar/origin_chip_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698