diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-05 21:36:57 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-05 21:36:57 +0000 |
| commit | c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351 (patch) | |
| tree | 6f71cefde95cc33d0f656917a48df2466f8c655a /chrome/browser/views/bookmark_bar_view.cc | |
| parent | 970556302b1ea50d4fc680d3656269cd50f6cf08 (diff) | |
| download | chromium_src-c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351.zip chromium_src-c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351.tar.gz chromium_src-c2cbeb9dd8aec543d5c6f0fe2aa99c1f8c655351.tar.bz2 | |
Readding UI test I pulled yesterday; hopefully the bots will like it more now. I need to wait for the bookmark bar to become visible so I plumbed in similar code as for the Find box instead of using Sleep's.
Review URL: http://codereview.chromium.org/473
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index fb9d579..191aa04 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -265,7 +265,7 @@ class BookmarkButton : public ChromeViews::TextButton { Profile* profile_; scoped_ptr<SlideAnimation> show_animation_; - DISALLOW_EVIL_CONSTRUCTORS(BookmarkButton); + DISALLOW_COPY_AND_ASSIGN(BookmarkButton); }; // DropInfo ------------------------------------------------------------------- @@ -545,7 +545,7 @@ class MenuRunner : public ChromeViews::MenuDelegate, scoped_ptr<BookmarkBarContextMenuController> context_menu_; - DISALLOW_EVIL_CONSTRUCTORS(MenuRunner); + DISALLOW_COPY_AND_ASSIGN(MenuRunner); }; // ButtonSeparatorView -------------------------------------------------------- @@ -585,7 +585,7 @@ class ButtonSeparatorView : public ChromeViews::View { } private: - DISALLOW_EVIL_CONSTRUCTORS(ButtonSeparatorView); + DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView); }; } // namespace |