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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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) 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_resource_providers.h" 5 #include "chrome/browser/task_manager/task_manager_resource_providers.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "content/public/browser/browser_child_process_host_iterator.h" 49 #include "content/public/browser/browser_child_process_host_iterator.h"
50 #include "content/public/browser/browser_thread.h" 50 #include "content/public/browser/browser_thread.h"
51 #include "content/public/browser/child_process_data.h" 51 #include "content/public/browser/child_process_data.h"
52 #include "content/public/browser/notification_service.h" 52 #include "content/public/browser/notification_service.h"
53 #include "content/public/browser/render_process_host.h" 53 #include "content/public/browser/render_process_host.h"
54 #include "content/public/browser/render_view_host.h" 54 #include "content/public/browser/render_view_host.h"
55 #include "content/public/browser/web_contents.h" 55 #include "content/public/browser/web_contents.h"
56 #include "content/public/common/process_type.h" 56 #include "content/public/common/process_type.h"
57 #include "grit/generated_resources.h" 57 #include "grit/generated_resources.h"
58 #include "grit/theme_resources.h" 58 #include "grit/theme_resources.h"
59 #include "grit/theme_resources_standard.h"
60 #include "third_party/sqlite/sqlite3.h" 59 #include "third_party/sqlite/sqlite3.h"
61 #include "ui/base/l10n/l10n_util.h" 60 #include "ui/base/l10n/l10n_util.h"
62 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
63 #include "ui/gfx/image/image_skia.h" 62 #include "ui/gfx/image/image_skia.h"
64 #include "v8/include/v8.h" 63 #include "v8/include/v8.h"
65 64
66 #if defined(OS_MACOSX) 65 #if defined(OS_MACOSX)
67 #include "ui/gfx/image/image_skia_util_mac.h" 66 #include "ui/gfx/image/image_skia_util_mac.h"
68 #endif 67 #endif
69 #if defined(OS_WIN) 68 #if defined(OS_WIN)
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 1492
1494 return &resource_; 1493 return &resource_;
1495 } 1494 }
1496 1495
1497 void TaskManagerBrowserProcessResourceProvider::StartUpdating() { 1496 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
1498 task_manager_->AddResource(&resource_); 1497 task_manager_->AddResource(&resource_);
1499 } 1498 }
1500 1499
1501 void TaskManagerBrowserProcessResourceProvider::StopUpdating() { 1500 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
1502 } 1501 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698