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

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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
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/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.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/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h" 14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
17 #include "chrome/test/base/browser_with_test_window_test.h" 17 #include "chrome/test/base/browser_with_test_window_test.h"
18 #include "chrome/test/base/scoped_testing_local_state.h" 18 #include "chrome/test/base/scoped_testing_local_state.h"
19 #include "chrome/test/base/testing_browser_process.h" 19 #include "chrome/test/base/testing_browser_process.h"
20 #include "chrome/test/base/testing_pref_service_syncable.h" 20 #include "chrome/test/base/testing_pref_service_syncable.h"
21 #include "components/bookmarks/browser/bookmark_model.h" 21 #include "components/bookmarks/browser/bookmark_model.h"
22 #include "components/bookmarks/test/bookmark_test_helpers.h" 22 #include "components/bookmarks/test/bookmark_test_helpers.h"
23 #include "components/search_engines/search_terms_data.h" 23 #include "components/search_engines/search_terms_data.h"
24 #include "components/search_engines/template_url_service.h" 24 #include "components/search_engines/template_url_service.h"
25 #include "components/search_engines/template_url_service_client.h" 25 #include "components/search_engines/template_url_service_client.h"
26 #include "ui/views/controls/button/label_button.h" 26 #include "ui/views/controls/button/label_button.h"
27 #include "ui/views/controls/button/menu_button.h" 27 #include "ui/views/controls/button/menu_button.h"
28 28
29 using bookmarks::BookmarkNode;
30
29 class BookmarkBarViewTest : public BrowserWithTestWindowTest { 31 class BookmarkBarViewTest : public BrowserWithTestWindowTest {
30 public: 32 public:
31 BookmarkBarViewTest() {} 33 BookmarkBarViewTest() {}
32 34
33 void SetUp() override { 35 void SetUp() override {
34 BrowserWithTestWindowTest::SetUp(); 36 BrowserWithTestWindowTest::SetUp();
35 local_state_.reset( 37 local_state_.reset(
36 new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal())); 38 new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal()));
37 } 39 }
38 40
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar, 354 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
353 new base::FundamentalValue(false)); 355 new base::FundamentalValue(false));
354 EXPECT_FALSE(test_helper_->apps_page_shortcut()->visible()); 356 EXPECT_FALSE(test_helper_->apps_page_shortcut()->visible());
355 357
356 // And try showing it via policy too. 358 // And try showing it via policy too.
357 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar, 359 prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
358 new base::FundamentalValue(true)); 360 new base::FundamentalValue(true));
359 EXPECT_TRUE(test_helper_->apps_page_shortcut()->visible()); 361 EXPECT_TRUE(test_helper_->apps_page_shortcut()->visible());
360 } 362 }
361 #endif 363 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698