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

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

Issue 658383003: Componentize Constrained Window Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
13 #include "chrome/browser/chrome_content_browser_client.h" 13 #include "chrome/browser/chrome_content_browser_client.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_tabstrip.h" 18 #include "chrome/browser/ui/browser_tabstrip.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 21 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
22 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
22 #include "chrome/common/chrome_content_client.h" 23 #include "chrome/common/chrome_content_client.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
24 #include "chrome/test/base/interactive_test_utils.h" 25 #include "chrome/test/base/interactive_test_utils.h"
25 #include "chrome/test/base/scoped_testing_local_state.h" 26 #include "chrome/test/base/scoped_testing_local_state.h"
26 #include "chrome/test/base/test_browser_window.h" 27 #include "chrome/test/base/test_browser_window.h"
27 #include "chrome/test/base/testing_browser_process.h" 28 #include "chrome/test/base/testing_browser_process.h"
28 #include "chrome/test/base/testing_profile.h" 29 #include "chrome/test/base/testing_profile.h"
29 #include "chrome/test/base/ui_test_utils.h" 30 #include "chrome/test/base/ui_test_utils.h"
30 #include "chrome/test/base/view_event_test_base.h" 31 #include "chrome/test/base/view_event_test_base.h"
31 #include "components/bookmarks/browser/bookmark_model.h" 32 #include "components/bookmarks/browser/bookmark_model.h"
32 #include "components/bookmarks/test/bookmark_test_helpers.h" 33 #include "components/bookmarks/test/bookmark_test_helpers.h"
34 #include "components/constrained_window/constrained_window_views.h"
33 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
34 #include "content/public/browser/page_navigator.h" 36 #include "content/public/browser/page_navigator.h"
35 #include "content/public/test/test_browser_thread.h" 37 #include "content/public/test/test_browser_thread.h"
36 #include "ui/aura/env.h" 38 #include "ui/aura/env.h"
37 #include "ui/aura/env_observer.h" 39 #include "ui/aura/env_observer.h"
38 #include "ui/aura/window.h" 40 #include "ui/aura/window.h"
39 #include "ui/base/clipboard/clipboard.h" 41 #include "ui/base/clipboard/clipboard.h"
40 #include "ui/base/test/ui_controls.h" 42 #include "ui/base/test/ui_controls.h"
41 #include "ui/events/keycodes/keyboard_codes.h" 43 #include "ui/events/keycodes/keyboard_codes.h"
42 #include "ui/views/controls/button/menu_button.h" 44 #include "ui/views/controls/button/menu_button.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 model_(NULL) {} 255 model_(NULL) {}
254 256
255 virtual void SetUp() override { 257 virtual void SetUp() override {
256 content_client_.reset(new ChromeContentClient); 258 content_client_.reset(new ChromeContentClient);
257 content::SetContentClient(content_client_.get()); 259 content::SetContentClient(content_client_.get());
258 browser_content_client_.reset(new chrome::ChromeContentBrowserClient()); 260 browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
259 content::SetBrowserClientForTesting(browser_content_client_.get()); 261 content::SetBrowserClientForTesting(browser_content_client_.get());
260 262
261 views::MenuController::TurnOffMenuSelectionHoldForTest(); 263 views::MenuController::TurnOffMenuSelectionHoldForTest();
262 BookmarkBarView::DisableAnimationsForTesting(true); 264 BookmarkBarView::DisableAnimationsForTesting(true);
265 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
263 266
264 profile_.reset(new TestingProfile()); 267 profile_.reset(new TestingProfile());
265 profile_->CreateBookmarkModel(true); 268 profile_->CreateBookmarkModel(true);
266 model_ = BookmarkModelFactory::GetForProfile(profile_.get()); 269 model_ = BookmarkModelFactory::GetForProfile(profile_.get());
267 bookmarks::test::WaitForBookmarkModelToLoad(model_); 270 bookmarks::test::WaitForBookmarkModelToLoad(model_);
268 profile_->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true); 271 profile_->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
269 272
270 Browser::CreateParams native_params(profile_.get(), 273 Browser::CreateParams native_params(profile_.get(),
271 chrome::GetActiveDesktop()); 274 chrome::GetActiveDesktop());
272 browser_.reset( 275 browser_.reset(
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 314
312 // Run the message loop to ensure we delete allTasks and fully shut down. 315 // Run the message loop to ensure we delete allTasks and fully shut down.
313 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); 316 base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
314 base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop); 317 base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop);
315 base::RunLoop run_loop; 318 base::RunLoop run_loop;
316 loop->PostTask(FROM_HERE, run_loop.QuitClosure()); 319 loop->PostTask(FROM_HERE, run_loop.QuitClosure());
317 run_loop.Run(); 320 run_loop.Run();
318 321
319 ViewEventTestBase::TearDown(); 322 ViewEventTestBase::TearDown();
320 BookmarkBarView::DisableAnimationsForTesting(false); 323 BookmarkBarView::DisableAnimationsForTesting(false);
324 SetConstrainedWindowViewsClient(scoped_ptr<ConstrainedWindowViewsClient>());
321 325
322 browser_content_client_.reset(); 326 browser_content_client_.reset();
323 content_client_.reset(); 327 content_client_.reset();
324 content::SetContentClient(NULL); 328 content::SetContentClient(NULL);
325 } 329 }
326 330
327 protected: 331 protected:
328 virtual views::View* CreateContentsView() override { 332 virtual views::View* CreateContentsView() override {
329 return bb_view_.get(); 333 return bb_view_.get();
330 } 334 }
(...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1988 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); 1992 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL);
1989 EXPECT_TRUE(bb_view_->GetMenu() == NULL); 1993 EXPECT_TRUE(bb_view_->GetMenu() == NULL);
1990 1994
1991 Done(); 1995 Done();
1992 } 1996 }
1993 1997
1994 BookmarkContextMenuNotificationObserver observer_; 1998 BookmarkContextMenuNotificationObserver observer_;
1995 }; 1999 };
1996 2000
1997 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) 2001 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698