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

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

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Addressed Feedback. Renamed ViewsLayoutDelegate to LayoutDelegate and ChromeViewsLayoutDelegate to … Created 3 years, 8 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
index 71208cbfc2501deb599f2a50a5ce703e6e5ff9de..aed455c12cd3402b4a817c120ccfb403406b9666 100644
--- 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
@@ -3,12 +3,16 @@
// found in the LICENSE file.
#include "ash/test/ash_test_base.h"
+#include "ash/test/ash_test_helper.h"
+#include "ash/test/ash_test_views_delegate.h"
#include "base/macros.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/browser/ui/views/harmony/chrome_layout_delegate.h"
#include "chrome/test/base/testing_profile.h"
#include "ui/views/controls/button/label_button.h"
+#include "ui/views/test/test_views_delegate.h"
#include "ui/views/widget/widget.h"
#include "ui/views/window/dialog_delegate.h"
@@ -26,6 +30,8 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
// Overridden from testing::Test:
void SetUp() override {
ash::test::AshTestBase::SetUp();
+ ash_test_helper()->views_delegate()->set_layout_delegate(
+ base::MakeUnique<ChromeLayoutDelegate>());
widget_ = views::DialogDelegate::CreateDialogWidget(
new views::DialogDelegateView(), CurrentContext(), NULL);
dialog_ = new AppInfoDialog(

Powered by Google App Engine
This is Rietveld 408576698