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

Side by Side Diff: ash/common/system/tray/system_tray_unittest.cc

Issue 2390953004: WidgetDelegateView is its own contents view. (Closed)
Patch Set: another minor fix Created 4 years, 2 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 (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 "ash/common/system/tray/system_tray.h" 5 #include "ash/common/system/tray/system_tray.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/accelerators/accelerator_controller.h" 10 #include "ash/common/accelerators/accelerator_controller.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 namespace { 44 namespace {
45 45
46 const char kVisibleRowsHistogramName[] = 46 const char kVisibleRowsHistogramName[] =
47 "Ash.SystemMenu.DefaultView.VisibleRows"; 47 "Ash.SystemMenu.DefaultView.VisibleRows";
48 48
49 class ModalWidgetDelegate : public views::WidgetDelegateView { 49 class ModalWidgetDelegate : public views::WidgetDelegateView {
50 public: 50 public:
51 ModalWidgetDelegate() {} 51 ModalWidgetDelegate() {}
52 ~ModalWidgetDelegate() override {} 52 ~ModalWidgetDelegate() override {}
53 53
54 views::View* GetContentsView() override { return this; }
55 ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; } 54 ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
56 55
57 private: 56 private:
58 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate); 57 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
59 }; 58 };
60 59
61 } // namespace 60 } // namespace
62 61
63 typedef AshTestBase SystemTrayTest; 62 typedef AshTestBase SystemTrayTest;
64 63
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 // Hide the default view, ensure the tray bubble height is back to zero. 639 // Hide the default view, ensure the tray bubble height is back to zero.
641 ASSERT_TRUE(tray->CloseSystemBubble()); 640 ASSERT_TRUE(tray->CloseSystemBubble());
642 RunAllPendingInMessageLoop(); 641 RunAllPendingInMessageLoop();
643 642
644 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); 643 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
645 } 644 }
646 #endif // OS_CHROMEOS 645 #endif // OS_CHROMEOS
647 646
648 } // namespace test 647 } // namespace test
649 } // namespace ash 648 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698