diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 23:54:20 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 23:54:20 +0000 |
| commit | ce494a316fe0f80de3271fe2710691f14a9c44e1 (patch) | |
| tree | 085de99b28ea75b111271f7b874cbcbef34e4e34 /chrome/browser/browser_prefs.cc | |
| parent | ac577490a5c20950f63d655de37058dc41486e99 (diff) | |
| download | chromium_src-ce494a316fe0f80de3271fe2710691f14a9c44e1.zip chromium_src-ce494a316fe0f80de3271fe2710691f14a9c44e1.tar.gz chromium_src-ce494a316fe0f80de3271fe2710691f14a9c44e1.tar.bz2 | |
GTK: Implement BlockedPopupContainerView for linux.
This doesn't have:
- rounded corners
- gradient background
- animating in or out.
- graphical polish
but it is fucntionally complete.
http://crbug.com/12843
Review URL: http://codereview.chromium.org/118480
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rwxr-xr-x | chrome/browser/browser_prefs.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index ffb1025f..24ff76f 100755 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -6,6 +6,7 @@ #include "chrome/browser/autofill_manager.h" #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "chrome/browser/blocked_popup_container.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/dom_ui/new_tab_ui.h" @@ -25,7 +26,6 @@ #if defined(OS_WIN) // TODO(port): whittle this down as we port #include "chrome/browser/task_manager.h" -#include "chrome/browser/views/blocked_popup_container_view_win.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/page_info_window.h" @@ -63,9 +63,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { TabContents::RegisterUserPrefs(user_prefs); TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); -#if defined(OS_WIN) // TODO(port): whittle this down as we port BlockedPopupContainer::RegisterUserPrefs(user_prefs); -#endif } } // namespace browser |