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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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
« no previous file with comments | « chrome/browser/search/local_ntp_source.cc ('k') | chrome/browser/themes/browser_theme_pack.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) 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 23 matching lines...) Expand all
34 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
35 #include "content/public/browser/gpu_data_manager.h" 35 #include "content/public/browser/gpu_data_manager.h"
36 #include "content/public/browser/gpu_data_manager_observer.h" 36 #include "content/public/browser/gpu_data_manager_observer.h"
37 #include "content/public/browser/resource_request_info.h" 37 #include "content/public/browser/resource_request_info.h"
38 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
39 #include "content/public/browser/web_contents_delegate.h" 39 #include "content/public/browser/web_contents_delegate.h"
40 #include "content/public/browser/worker_service.h" 40 #include "content/public/browser/worker_service.h"
41 #include "content/public/common/result_codes.h" 41 #include "content/public/common/result_codes.h"
42 #include "extensions/browser/extension_system.h" 42 #include "extensions/browser/extension_system.h"
43 #include "grit/generated_resources.h" 43 #include "grit/generated_resources.h"
44 #include "grit/ui_resources.h"
45 #include "third_party/icu/source/i18n/unicode/coll.h" 44 #include "third_party/icu/source/i18n/unicode/coll.h"
46 #include "ui/base/l10n/l10n_util.h" 45 #include "ui/base/l10n/l10n_util.h"
47 #include "ui/base/resource/resource_bundle.h" 46 #include "ui/base/resource/resource_bundle.h"
48 #include "ui/base/text/bytes_formatting.h" 47 #include "ui/base/text/bytes_formatting.h"
49 #include "ui/gfx/image/image_skia.h" 48 #include "ui/gfx/image/image_skia.h"
49 #include "ui/resources/grit/ui_resources.h"
50 50
51 #if defined(OS_MACOSX) 51 #if defined(OS_MACOSX)
52 #include "content/public/browser/browser_child_process_host.h" 52 #include "content/public/browser/browser_child_process_host.h"
53 #endif 53 #endif
54 54
55 using content::BrowserThread; 55 using content::BrowserThread;
56 using content::ResourceRequestInfo; 56 using content::ResourceRequestInfo;
57 using content::WebContents; 57 using content::WebContents;
58 using task_manager::Resource; 58 using task_manager::Resource;
59 using task_manager::ResourceProvider; 59 using task_manager::ResourceProvider;
(...skipping 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 params.host_desktop_type = desktop_type; 1544 params.host_desktop_type = desktop_type;
1545 chrome::Navigate(&params); 1545 chrome::Navigate(&params);
1546 } 1546 }
1547 1547
1548 TaskManager::TaskManager() 1548 TaskManager::TaskManager()
1549 : model_(new TaskManagerModel(this)) { 1549 : model_(new TaskManagerModel(this)) {
1550 } 1550 }
1551 1551
1552 TaskManager::~TaskManager() { 1552 TaskManager::~TaskManager() {
1553 } 1553 }
OLDNEW
« no previous file with comments | « chrome/browser/search/local_ntp_source.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698