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

Unified Diff: ash/launcher/launcher_tooltip_manager_unittest.cc

Issue 11801027: More work to make ash_unittests pass when we require context. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix TableViewTest by making it a ViewsTestBase. Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/drag_drop/drag_image_view.cc ('k') | ash/launcher/launcher_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_tooltip_manager_unittest.cc
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index 249b0a084c3627e0eceef085573f1c7ff19caf08..7cc972aa7fabd7e7f376b2cf9d5b93e0d7be043d 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/root_window_controller.h"
#include "ash/shell.h"
+#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/shelf_layout_manager.h"
#include "ash/wm/window_util.h"
@@ -51,12 +52,12 @@ class LauncherTooltipManagerTest : public AshTestBase {
}
void ShowDelayed() {
- dummy_anchor_.reset(new views::View);
+ CreateWidget();
tooltip_manager_->ShowDelayed(dummy_anchor_.get(), string16());
}
void ShowImmediately() {
- dummy_anchor_.reset(new views::View);
+ CreateWidget();
tooltip_manager_->ShowImmediately(dummy_anchor_.get(), string16());
}
@@ -77,10 +78,27 @@ class LauncherTooltipManagerTest : public AshTestBase {
}
protected:
+ scoped_ptr<views::Widget> widget_;
scoped_ptr<views::View> dummy_anchor_;
scoped_ptr<internal::LauncherTooltipManager> tooltip_manager_;
private:
+ void CreateWidget() {
+ dummy_anchor_.reset(new views::View);
+
+ widget_.reset(new views::Widget);
+ views::Widget::InitParams params(
+ views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+ params.transparent = true;
+ params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+ params.parent = Shell::GetContainer(
+ Shell::GetPrimaryRootWindow(),
+ ash::internal::kShellWindowId_LauncherContainer);
+
+ widget_->Init(params);
+ widget_->SetContentsView(dummy_anchor_.get());
+ }
+
DISALLOW_COPY_AND_ASSIGN(LauncherTooltipManagerTest);
};
@@ -103,6 +121,7 @@ TEST_F(LauncherTooltipManagerTest, HideWhenShelfIsHidden) {
scoped_ptr<views::Widget> widget(new views::Widget);
views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+ params.context = CurrentContext();
widget->Init(params);
widget->SetFullscreen(true);
widget->Show();
« no previous file with comments | « ash/drag_drop/drag_image_view.cc ('k') | ash/launcher/launcher_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698