OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 browser_content_client_.reset(); | 194 browser_content_client_.reset(); |
195 content_client_.reset(); | 195 content_client_.reset(); |
196 content::SetContentClient(NULL); | 196 content::SetContentClient(NULL); |
197 } | 197 } |
198 | 198 |
199 protected: | 199 protected: |
200 virtual views::View* CreateContentsView() OVERRIDE { | 200 virtual views::View* CreateContentsView() OVERRIDE { |
201 return bb_view_.get(); | 201 return bb_view_.get(); |
202 } | 202 } |
203 | 203 |
204 virtual gfx::Size GetPreferredSize() OVERRIDE { return bb_view_pref_; } | 204 virtual gfx::Size GetPreferredSize() const OVERRIDE { return bb_view_pref_; } |
205 | 205 |
206 views::TextButton* GetBookmarkButton(int view_index) { | 206 views::TextButton* GetBookmarkButton(int view_index) { |
207 return bb_view_->GetBookmarkButton(view_index); | 207 return bb_view_->GetBookmarkButton(view_index); |
208 } | 208 } |
209 | 209 |
210 // See comment above class description for what this does. | 210 // See comment above class description for what this does. |
211 virtual bool CreateBigMenu() { return false; } | 211 virtual bool CreateBigMenu() { return false; } |
212 | 212 |
213 BookmarkModel* model_; | 213 BookmarkModel* model_; |
214 scoped_ptr<BookmarkBarView> bb_view_; | 214 scoped_ptr<BookmarkBarView> bb_view_; |
(...skipping 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1831 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); | 1831 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); |
1832 EXPECT_TRUE(bb_view_->GetMenu() == NULL); | 1832 EXPECT_TRUE(bb_view_->GetMenu() == NULL); |
1833 | 1833 |
1834 Done(); | 1834 Done(); |
1835 } | 1835 } |
1836 | 1836 |
1837 BookmarkContextMenuNotificationObserver observer_; | 1837 BookmarkContextMenuNotificationObserver observer_; |
1838 }; | 1838 }; |
1839 | 1839 |
1840 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) | 1840 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) |
OLD | NEW |