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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

Issue 1175783003: Split out Ash dependency in app info dialog unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ViewEventTestBase will not play nice Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..44faee3837f855ebdb277b8e390d7a6cf535970a
--- /dev/null
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
@@ -0,0 +1,71 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/test/ash_test_base.h"
+#include "chrome/browser/extensions/test_extension_environment.h"
+#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h"
+#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h"
+#include "chrome/test/base/testing_profile.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_delegate.h"
+
+namespace {
+
+const char kTestExtensionId[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+
+} // namespace
+
+class AppInfoDialogAshTest : public ash::test::AshTestBase {
+ public:
+ AppInfoDialogAshTest()
+ : extension_environment_(base::MessageLoopForUI::current()) {}
+
+ // Overridden from testing::Test:
+ void SetUp() override {
+ ash::test::AshTestBase::SetUp();
+ widget_ = views::DialogDelegate::CreateDialogWidget(
+ new views::DialogDelegateView(), CurrentContext(), NULL);
+ dialog_ = new AppInfoDialog(
+ widget_->GetNativeWindow(), extension_environment_.profile(),
+ extension_environment_.MakePackagedApp(kTestExtensionId, true).get());
+ widget_->GetContentsView()->AddChildView(dialog_);
+ }
+
+ void TearDown() override {
+ widget_->CloseNow();
+ ash::test::AshTestBase::TearDown();
+ }
+
+ protected:
+ extensions::TestExtensionEnvironment extension_environment_;
+ views::Widget* widget_ = nullptr;
+ AppInfoDialog* dialog_ = nullptr; // Owned by |widget_|'s views hierarchy.
+
+ DISALLOW_COPY_AND_ASSIGN(AppInfoDialogAshTest);
+};
+
+// Tests that the pin/unpin button is focused after unpinning/pinning. This is
+// to verify regression in crbug.com/428704 is fixed.
+TEST_F(AppInfoDialogAshTest, PinButtonsAreFocusedAfterPinUnpin) {
+ AppInfoFooterPanel* dialog_footer =
+ static_cast<AppInfoFooterPanel*>(dialog_->dialog_footer_);
+ views::View* pin_button = dialog_footer->pin_to_shelf_button_;
+ views::View* unpin_button = dialog_footer->unpin_from_shelf_button_;
+
+ pin_button->RequestFocus();
+ EXPECT_TRUE(pin_button->visible());
+ EXPECT_FALSE(unpin_button->visible());
+ EXPECT_TRUE(pin_button->HasFocus());
+
+ dialog_footer->SetPinnedToShelf(true);
+ EXPECT_FALSE(pin_button->visible());
+ EXPECT_TRUE(unpin_button->visible());
+ EXPECT_TRUE(unpin_button->HasFocus());
+
+ dialog_footer->SetPinnedToShelf(false);
+ EXPECT_TRUE(pin_button->visible());
+ EXPECT_FALSE(unpin_button->visible());
+ EXPECT_TRUE(pin_button->HasFocus());
+}

Powered by Google App Engine
This is Rietveld 408576698