summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/bookmark_bar_view.h
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 22:49:23 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 22:49:23 +0000
commit26413f102e91456639284b14a82a23850591527e (patch)
tree02dcac1d76bd27709b18a98188e01235f05fe872 /chrome/browser/views/bookmark_bar_view.h
parent2884f8e77c8df5d80414c70b8f775ae090eb7900 (diff)
downloadchromium_src-26413f102e91456639284b14a82a23850591527e.zip
chromium_src-26413f102e91456639284b14a82a23850591527e.tar.gz
chromium_src-26413f102e91456639284b14a82a23850591527e.tar.bz2
Remove the browser_sync flag.
BUG=none TEST=none Review URL: http://codereview.chromium.org/337034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.h')
-rw-r--r--chrome/browser/views/bookmark_bar_view.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 0d79cc6..49ac37f 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -36,9 +36,7 @@ class TextButton;
// waits until the HistoryService for the profile has been loaded before
// creating the BookmarkModel.
class BookmarkBarView : public DetachableToolbarView,
-#if defined(BROWSER_SYNC)
public ProfileSyncServiceObserver,
-#endif
public BookmarkModelObserver,
public views::ViewMenuDelegate,
public views::ButtonListener,
@@ -118,10 +116,8 @@ class BookmarkBarView : public DetachableToolbarView,
virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
virtual void SetAccessibleName(const std::wstring& name);
-#if defined(BROWSER_SYNC)
// ProfileSyncServiceObserver method.
virtual void OnStateChanged();
-#endif
// Called when fullscreen mode toggles on or off; this affects our layout.
void OnFullscreenToggled(bool fullscreen);
@@ -418,14 +414,13 @@ class BookmarkBarView : public DetachableToolbarView,
// desired bounds. If |compute_bounds_only| = FALSE, the bounds are set.
gfx::Size LayoutItems(bool compute_bounds_only);
-#if defined(BROWSER_SYNC)
// Determines whether the sync error button should appear on the bookmarks
// bar.
bool ShouldShowSyncErrorButton();
// Creates the sync error button and adds it as a child view.
views::TextButton* CreateSyncErrorButton();
-#endif
+
NotificationRegistrar registrar_;
Profile* profile_;
@@ -458,14 +453,12 @@ class BookmarkBarView : public DetachableToolbarView,
// Used to track drops on the bookmark bar view.
scoped_ptr<DropInfo> drop_info_;
-#if defined(BROWSER_SYNC)
// The sync re-login indicator which appears when the user needs to re-enter
// credentials in order to continue syncing.
views::TextButton* sync_error_button_;
// A pointer to the ProfileSyncService instance if one exists.
ProfileSyncService* sync_service_;
-#endif
// Visible if not all the bookmark buttons fit.
views::MenuButton* overflow_button_;