OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/gtk/bookmark_bar_gtk.h" | 5 #include "chrome/browser/gtk/bookmark_bar_gtk.h" |
6 | 6 |
| 7 #include "base/task.h" |
7 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
9 #include "chrome/browser/browser.h" | |
10 #include "chrome/browser/browser_thread.h" | 10 #include "chrome/browser/browser_thread.h" |
11 #include "chrome/browser/gtk/tabstrip_origin_provider.h" | 11 #include "chrome/browser/gtk/tabstrip_origin_provider.h" |
12 #include "base/task.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/test/testing_profile.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
14 #include "chrome/test/testing_profile.h" | |
15 | 15 |
16 // Dummy implementation that's good enough for the tests; we don't test | 16 // Dummy implementation that's good enough for the tests; we don't test |
17 // rendering here so all we need is a non-NULL object. | 17 // rendering here so all we need is a non-NULL object. |
18 class EmptyTabstripOriginProvider : public TabstripOriginProvider { | 18 class EmptyTabstripOriginProvider : public TabstripOriginProvider { |
19 public: | 19 public: |
20 virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) { | 20 virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) { |
21 return gfx::Point(0, 0); | 21 return gfx::Point(0, 0); |
22 } | 22 } |
23 }; | 23 }; |
24 | 24 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 ASCIIToUTF16("other"), GURL("http://two.com")); | 89 ASCIIToUTF16("other"), GURL("http://two.com")); |
90 | 90 |
91 bookmark_bar_->Loaded(model); | 91 bookmark_bar_->Loaded(model); |
92 | 92 |
93 // We should expect two children to the bookmark bar's toolbar. | 93 // We should expect two children to the bookmark bar's toolbar. |
94 GList* children = gtk_container_get_children( | 94 GList* children = gtk_container_get_children( |
95 GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get())); | 95 GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get())); |
96 EXPECT_EQ(2U, g_list_length(children)); | 96 EXPECT_EQ(2U, g_list_length(children)); |
97 g_list_free(children); | 97 g_list_free(children); |
98 } | 98 } |
OLD | NEW |