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

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

Issue 298813002: views: Move MenuButton from TextButton to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable DragDirectlyToSecondWindow. 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 "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"
11 #include "chrome/browser/search_engines/template_url_service.h" 11 #include "chrome/browser/search_engines/template_url_service.h"
12 #include "chrome/browser/search_engines/template_url_service_factory.h" 12 #include "chrome/browser/search_engines/template_url_service_factory.h"
13 #include "chrome/browser/ui/app_list/app_list_util.h" 13 #include "chrome/browser/ui/app_list/app_list_util.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "chrome/test/base/browser_with_test_window_test.h" 16 #include "chrome/test/base/browser_with_test_window_test.h"
17 #include "chrome/test/base/scoped_testing_local_state.h" 17 #include "chrome/test/base/scoped_testing_local_state.h"
18 #include "chrome/test/base/testing_browser_process.h" 18 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_pref_service_syncable.h" 19 #include "chrome/test/base/testing_pref_service_syncable.h"
20 #include "components/bookmarks/test/bookmark_test_helpers.h" 20 #include "components/bookmarks/test/bookmark_test_helpers.h"
21 #include "ui/views/controls/button/text_button.h" 21 #include "ui/views/controls/button/label_button.h"
22 22
23 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest { 23 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest {
24 public: 24 public:
25 BookmarkBarViewInstantExtendedTest() { 25 BookmarkBarViewInstantExtendedTest() {
26 } 26 }
27 27
28 protected: 28 protected:
29 virtual TestingProfile* CreateProfile() OVERRIDE { 29 virtual TestingProfile* CreateProfile() OVERRIDE {
30 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); 30 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
31 // TemplateURLService is normally NULL during testing. Instant extended 31 // TemplateURLService is normally NULL during testing. Instant extended
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar, 96 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
97 new base::FundamentalValue(false)); 97 new base::FundamentalValue(false));
98 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible()); 98 EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
99 99
100 // And try showing it via policy too. 100 // And try showing it via policy too.
101 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar, 101 prefs->SetManagedPref(prefs::kShowAppsShortcutInBookmarkBar,
102 new base::FundamentalValue(true)); 102 new base::FundamentalValue(true));
103 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible()); 103 EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
104 } 104 }
105 #endif 105 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698