diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 05:31:35 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 05:31:35 +0000 |
| commit | 9f0c31420542a52626aee27b07fc72162b9c585a (patch) | |
| tree | 262b96f93ccc812118a73736aa10bc89a24f43a9 /chrome/browser/views | |
| parent | 659ee3327806513135c30a495c081cdebf8af708 (diff) | |
| download | chromium_src-9f0c31420542a52626aee27b07fc72162b9c585a.zip chromium_src-9f0c31420542a52626aee27b07fc72162b9c585a.tar.gz chromium_src-9f0c31420542a52626aee27b07fc72162b9c585a.tar.bz2 | |
Third take at fixing Linux views build
TBR=darin
BUG=33314
TEST=none
Review URL: http://codereview.chromium.org/558056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/content_blocked_bubble_contents.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/views/content_blocked_bubble_contents.cc b/chrome/browser/views/content_blocked_bubble_contents.cc index 421f434..8d53c5a 100644 --- a/chrome/browser/views/content_blocked_bubble_contents.cc +++ b/chrome/browser/views/content_blocked_bubble_contents.cc @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "chrome/browser/views/info_bubble.h" -#include "chrome/browser/views/options/content_settings_window_view.h" #include "grit/generated_resources.h" #include "views/controls/button/native_button.h" #include "views/controls/button/radio_button.h" @@ -15,6 +14,10 @@ #include "views/grid_layout.h" #include "views/standard_layout.h" +#if defined(OS_WIN) +#include "chrome/browser/views/options/content_settings_window_view.h" +#endif + ContentBlockedBubbleContents::ContentBlockedBubbleContents( ContentSettingsType content_type, const std::wstring& host, @@ -52,10 +55,14 @@ void ContentBlockedBubbleContents::ButtonPressed(views::Button* sender, void ContentBlockedBubbleContents::LinkActivated(views::Link* source, int event_flags) { if (source == manage_link_) { +#if defined(OS_WIN) ContentSettingsWindowView::Show(content_type_, profile_); // CAREFUL: Showing the settings window activates it, which deactivates the // info bubble, which causes it to close, which deletes us. return; +#else + // TODO(pkasting): Linux views doesn't have the same options dialogs. +#endif } // TODO(pkasting): A popup link was clicked, show the corresponding popup. |