diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 18:04:25 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 18:04:25 +0000 |
| commit | 2313a94de16f758bd296c95a988fd45d601ca5f7 (patch) | |
| tree | 2784b4aca2d8e7cecd0d0cf5186a25d21348c14f /chrome/browser | |
| parent | 896e0965695e8770ab2f78c2a5231a0bb6ad0c8c (diff) | |
| download | chromium_src-2313a94de16f758bd296c95a988fd45d601ca5f7.zip chromium_src-2313a94de16f758bd296c95a988fd45d601ca5f7.tar.gz chromium_src-2313a94de16f758bd296c95a988fd45d601ca5f7.tar.bz2 | |
Fix clang by making type_ defined during OS_LINUX non-OS_CHROMEOS builds.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/views/bubble/bubble.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/bubble/bubble.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/bubble/bubble.cc b/chrome/browser/ui/views/bubble/bubble.cc index 29ea30a..3bcd8a2 100644 --- a/chrome/browser/ui/views/bubble/bubble.cc +++ b/chrome/browser/ui/views/bubble/bubble.cc @@ -129,8 +129,10 @@ Bubble::Bubble() delegate_(NULL), show_status_(kOpen), fade_away_on_close_(false), -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) type_(views::Widget::CreateParams::TYPE_WINDOW), +#endif +#if defined(OS_CHROMEOS) show_while_screen_is_locked_(false), #endif arrow_location_(BubbleBorder::NONE), diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index 3504ab9..fe19dad 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -201,9 +201,11 @@ class Bubble // Whether to fade away when the bubble closes. bool fade_away_on_close_; -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) // Some callers want the bubble to be a child control instead of a window. views::Widget::CreateParams::Type type_; +#endif +#if defined(OS_CHROMEOS) // Should we set a property telling the window manager to show this window // onscreen even when the screen is locked? bool show_while_screen_is_locked_; |