diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/dom_ui/shown_sections_handler.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/dom_ui/shown_sections_handler.h')
| -rw-r--r-- | chrome/browser/dom_ui/shown_sections_handler.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/shown_sections_handler.h b/chrome/browser/dom_ui/shown_sections_handler.h index be07735..e82c3fb 100644 --- a/chrome/browser/dom_ui/shown_sections_handler.h +++ b/chrome/browser/dom_ui/shown_sections_handler.h @@ -8,6 +8,7 @@ #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/common/notification_observer.h" +#include "chrome/common/notification_registrar.h" #include "chrome/browser/prefs/pref_change_registrar.h" class DOMUI; @@ -23,6 +24,9 @@ enum Section { THUMB = 1 << 0, APPS = 1 << 6, + // We use the low 16 bits for sections, the high 16 bits for minimized state. + ALL_SECTIONS_MASK = 0x0000FFFF, + // If one of these is set, then the corresponding section is shown minimized // at the bottom of the NTP and no data is directly visible on the NTP. MINIMIZED_THUMB = 1 << (0 + 16), @@ -61,7 +65,8 @@ class ShownSectionsHandler : public DOMMessageHandler, private: PrefService* pref_service_; - PrefChangeRegistrar registrar_; + PrefChangeRegistrar pref_registrar_; + NotificationRegistrar notification_registrar_; DISALLOW_COPY_AND_ASSIGN(ShownSectionsHandler); }; |