diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 20:13:24 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 20:13:24 +0000 |
| commit | dfb70b27fd057cdc4a2139b6026a3e45659bcd5a (patch) | |
| tree | eb062565e362040caf4ced7610b913b5c402ee4c | |
| parent | c675add6d667a164e7df66c1d02691936b344a72 (diff) | |
| download | chromium_src-dfb70b27fd057cdc4a2139b6026a3e45659bcd5a.zip chromium_src-dfb70b27fd057cdc4a2139b6026a3e45659bcd5a.tar.gz chromium_src-dfb70b27fd057cdc4a2139b6026a3e45659bcd5a.tar.bz2 | |
Gets TabIconView compiling on linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115905
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17210 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/tab_icon_view.cc | 14 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 3349bb4..7fdbdac 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -4,20 +4,26 @@ #include "chrome/browser/views/tab_icon_view.h" +#if defined(OS_WIN) #include <windows.h> #include <shellapi.h> +#endif #include "app/gfx/canvas.h" #include "app/gfx/favicon_size.h" -#include "app/gfx/icon_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" +#include "base/logging.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#if defined(OS_WIN) +#include "app/gfx/icon_util.h" +#endif + static bool g_initialized = false; static SkBitmap* g_default_fav_icon = NULL; static SkBitmap* g_throbber_frames = NULL; @@ -29,6 +35,7 @@ void TabIconView::InitializeIfNeeded() { if (!g_initialized) { ResourceBundle &rb = ResourceBundle::GetSharedInstance(); +#if defined(OS_WIN) // The default window icon is the application icon, not the default // favicon. std::wstring exe_path; @@ -38,6 +45,9 @@ void TabIconView::InitializeIfNeeded() { g_default_fav_icon = IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16)); DestroyIcon(app_icon); +#else + NOTIMPLEMENTED(); +#endif g_throbber_frames = rb.GetBitmapNamed(IDR_THROBBER); g_throbber_frames_light = rb.GetBitmapNamed(IDR_THROBBER_LIGHT); @@ -53,8 +63,8 @@ void TabIconView::InitializeIfNeeded() { TabIconView::TabIconView(TabIconViewModel* model) : model_(model), - is_light_(false), throbber_running_(false), + is_light_(false), throbber_frame_(0) { InitializeIfNeeded(); } diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 31afcd9..ba54c77 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1764,6 +1764,8 @@ ['include', '^browser/views/tab_contents/native_tab_contents_container_gtk.h'], ['include', '^browser/views/tab_contents/tab_contents_container.cc'], ['include', '^browser/views/tab_contents/tab_contents_container.h'], + ['include', '^browser/views/tab_icon_view.cc'], + ['include', '^browser/views/tab_icon_view.h'], ['include', '^browser/views/tabs/dragged_tab_view.cc'], ['include', '^browser/views/tabs/dragged_tab_view.h'], ['include', '^browser/views/tabs/tab.cc'], |