diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 19:25:42 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 19:25:42 +0000 |
| commit | c4029f33c618f6c2165635b030872069ab53fb2b (patch) | |
| tree | 8bce083abfa5f495c2a086ca1816b86a722f4eeb /chrome/browser/task_manager_resource_providers.cc | |
| parent | 955be75d7b55716fd4a1eba787b9311be20b8ab8 (diff) | |
| download | chromium_src-c4029f33c618f6c2165635b030872069ab53fb2b.zip chromium_src-c4029f33c618f6c2165635b030872069ab53fb2b.tar.gz chromium_src-c4029f33c618f6c2165635b030872069ab53fb2b.tar.bz2 | |
Add more functionality to the gtk task manager:
* Columns are resizable.
* Resource icon displayed by resource name.
BUG=11392
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_resource_providers.cc')
| -rw-r--r-- | chrome/browser/task_manager_resource_providers.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index f76d8ad..77cbf10 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -643,10 +643,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserProcessResource() pid_ = base::GetCurrentProcId(); bool success = base::OpenPrivilegedProcessHandle(pid_, &process_); DCHECK(success); -#if !defined(OS_WIN) - // TODO(port): Port icon code. - NOTIMPLEMENTED(); -#else +#if defined(OS_WIN) if (!default_icon_) { HICON icon = LoadIcon(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDR_MAINFRAME)); @@ -661,6 +658,14 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserProcessResource() default_icon_ = IconUtil::CreateSkBitmapFromHICON(icon, icon_size); } } +#elif defined(OS_LINUX) + if (!default_icon_) { + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + default_icon_ = rb.GetBitmapNamed(IDR_PRODUCT_LOGO_16); + } +#else + // TODO(port): Port icon code. + NOTIMPLEMENTED(); #endif // defined(OS_WIN) } |