diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 16:36:46 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-06 16:36:46 +0000 |
| commit | e4f565bec6ebdba25011bf778b49fd618e6a5d1e (patch) | |
| tree | 17fca73a9dc4625d720269895d52e7a53c74e1cf /chrome/browser/status_icons | |
| parent | 1ad97cad62acf7adce661c009a6ee1d65d92e2d1 (diff) | |
| download | chromium_src-e4f565bec6ebdba25011bf778b49fd618e6a5d1e.zip chromium_src-e4f565bec6ebdba25011bf778b49fd618e6a5d1e.tar.gz chromium_src-e4f565bec6ebdba25011bf778b49fd618e6a5d1e.tar.bz2 | |
gtk: Implement status icons on linux.
(Retry with less build breakage this time.)
BUG=37375
TEST=out/Debug/unit_tests --gtest_filter=StatusTrayGtkTest.*
Patch from Thiago Farina <thiago.farina@gmail.com>
Review URL: http://codereview.chromium.org/1421001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/status_icons')
| -rw-r--r-- | chrome/browser/status_icons/status_tray_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/status_icons/status_tray_manager.cc b/chrome/browser/status_icons/status_tray_manager.cc index b5465c3..7a8a779 100644 --- a/chrome/browser/status_icons/status_tray_manager.cc +++ b/chrome/browser/status_icons/status_tray_manager.cc @@ -23,7 +23,7 @@ StatusTrayManager::~StatusTrayManager() { } void StatusTrayManager::Init(Profile* profile) { -#if !defined(OS_LINUX) +#if !(defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) DCHECK(profile); profile_ = profile; status_tray_.reset(StatusTray::Create()); |