Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

Issue 312673006: Added a policy to control the visibility of the apps shortcut. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.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 "chrome/test/base/testing_pref_service_syncable.h"
18 #include "components/bookmarks/test/bookmark_test_helpers.h" 19 #include "components/bookmarks/test/bookmark_test_helpers.h"
19 #include "ui/views/controls/button/text_button.h" 20 #include "ui/views/controls/button/text_button.h"
20 21
21 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { 22 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest {
22 public: 23 public:
23 BookmarkBarViewInstantExtendedTest() { 24 BookmarkBarViewInstantExtendedTest() {
24 } 25 }
25 26
26 protected: 27 protected:
27 virtual TestingProfile* CreateProfile() OVERRIDE { 28 virtual TestingProfile* CreateProfile() OVERRIDE {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); 64 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
64 } else { 65 } else {
65 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); 66 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
66 } 67 }
67 68
68 // Make sure we can also properly transition from true to false. 69 // Make sure we can also properly transition from true to false.
69 browser()->profile()->GetPrefs()->SetBoolean( 70 browser()->profile()->GetPrefs()->SetBoolean(
70 prefs::kShowAppsShortcutInBookmarkBar, false); 71 prefs::kShowAppsShortcutInBookmarkBar, false);
71 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); 72 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
72 } 73 }
74
75 // Verifies that the apps shortcut is shown or hidden following the policy
76 // value.
77 TEST_F(BookmarkBarViewInstantExtendedTest,
sky 2014/06/03 16:15:07 Your test has nothing to do with instant, so makin
Joao da Silva 2014/06/03 22:20:52 Done.
78 ManagedShowAppsShortcutInBookmarksBar) {
79 ScopedTestingLocalState local_state(TestingBrowserProcess::GetGlobal());
80 profile()->CreateBookmarkModel(true);
81 test::WaitForBookmarkModelToLoad(
82 BookmarkModelFactory::GetForProfile(profile()));
83 BookmarkBarView bookmark_bar_view(browser(), NULL);
84 bookmark_bar_view.set_owned_by_client();
85
86 // By default the pref is not managed and the apps shortcut is shown.
87 TestingPrefServiceSyncable* prefs = profile()->GetTestingPrefService();
88 EXPECT_FALSE(
89 prefs->IsManagedPreference(prefs::kShowAppsShortcutInBookmarkBar));
90 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
91
92 // Hide the apps shortcut by policy, via the managed pref.
93 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
94 new base::FundamentalValue(false));
95 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
96
97 // And try showing it via policy too.
98 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
99 new base::FundamentalValue(true));
100 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698