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 "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "components/search_engines/template_url_service.h" | 21 #include "components/search_engines/template_url_service.h" |
22 #include "components/search_engines/template_url_service_client.h" | 22 #include "components/search_engines/template_url_service_client.h" |
23 #include "ui/views/controls/button/label_button.h" | 23 #include "ui/views/controls/button/label_button.h" |
24 | 24 |
25 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { | 25 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { |
26 public: | 26 public: |
27 BookmarkBarViewInstantExtendedTest() { | 27 BookmarkBarViewInstantExtendedTest() { |
28 } | 28 } |
29 | 29 |
30 protected: | 30 protected: |
31 virtual TestingProfile* CreateProfile() OVERRIDE { | 31 virtual TestingProfile* CreateProfile() override { |
32 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); | 32 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); |
33 // TemplateURLService is normally NULL during testing. Instant extended | 33 // TemplateURLService is normally NULL during testing. Instant extended |
34 // needs this service so set a custom factory function. | 34 // needs this service so set a custom factory function. |
35 TemplateURLServiceFactory::GetInstance()->SetTestingFactory( | 35 TemplateURLServiceFactory::GetInstance()->SetTestingFactory( |
36 profile, &BookmarkBarViewInstantExtendedTest::CreateTemplateURLService); | 36 profile, &BookmarkBarViewInstantExtendedTest::CreateTemplateURLService); |
37 return profile; | 37 return profile; |
38 } | 38 } |
39 | 39 |
40 private: | 40 private: |
41 static KeyedService* CreateTemplateURLService( | 41 static KeyedService* CreateTemplateURLService( |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar, | 101 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar, |
102 new base::FundamentalValue(false)); | 102 new base::FundamentalValue(false)); |
103 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); | 103 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); |
104 | 104 |
105 // And try showing it via policy too. | 105 // And try showing it via policy too. |
106 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar, | 106 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar, |
107 new base::FundamentalValue(true)); | 107 new base::FundamentalValue(true)); |
108 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); | 108 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); |
109 } | 109 } |
110 #endif | 110 #endif |
OLD | NEW |