OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui/views/bookmarks/bookmark_bar_view.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" | 8 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search_engines/template_url_service.h" | 10 #include "chrome/browser/search_engines/template_url_service.h" |
11 #include "chrome/browser/search_engines/template_url_service_factory.h" | 11 #include "chrome/browser/search_engines/template_url_service_factory.h" |
12 #include "chrome/browser/ui/app_list/app_list_util.h" | 12 #include "chrome/browser/ui/app_list/app_list_util.h" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
15 #include "chrome/test/base/browser_with_test_window_test.h" | 15 #include "chrome/test/base/browser_with_test_window_test.h" |
16 #include "chrome/test/base/scoped_testing_local_state.h" | 16 #include "chrome/test/base/scoped_testing_local_state.h" |
17 #include "chrome/test/base/testing_browser_process.h" | 17 #include "chrome/test/base/testing_browser_process.h" |
| 18 #include "components/bookmarks/bookmark_pref_names.h" |
18 #include "ui/views/controls/button/text_button.h" | 19 #include "ui/views/controls/button/text_button.h" |
19 | 20 |
20 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { | 21 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { |
21 public: | 22 public: |
22 BookmarkBarViewInstantExtendedTest() { | 23 BookmarkBarViewInstantExtendedTest() { |
23 } | 24 } |
24 | 25 |
25 protected: | 26 protected: |
26 virtual TestingProfile* CreateProfile() OVERRIDE { | 27 virtual TestingProfile* CreateProfile() OVERRIDE { |
27 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); | 28 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); | 62 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); |
62 } else { | 63 } else { |
63 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); | 64 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); |
64 } | 65 } |
65 | 66 |
66 // Make sure we can also properly transition from true to false. | 67 // Make sure we can also properly transition from true to false. |
67 browser()->profile()->GetPrefs()->SetBoolean( | 68 browser()->profile()->GetPrefs()->SetBoolean( |
68 prefs::kShowAppsShortcutInBookmarkBar, false); | 69 prefs::kShowAppsShortcutInBookmarkBar, false); |
69 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); | 70 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); |
70 } | 71 } |
OLD | NEW |