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

Side by Side Diff: ash/root_window_controller_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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 namespace ash { 54 namespace ash {
55 namespace { 55 namespace {
56 56
57 class TestDelegate : public views::WidgetDelegateView { 57 class TestDelegate : public views::WidgetDelegateView {
58 public: 58 public:
59 explicit TestDelegate(bool system_modal) : system_modal_(system_modal) {} 59 explicit TestDelegate(bool system_modal) : system_modal_(system_modal) {}
60 ~TestDelegate() override {} 60 ~TestDelegate() override {}
61 61
62 // Overridden from views::WidgetDelegate: 62 // Overridden from views::WidgetDelegate:
63 views::View* GetContentsView() override { return this; }
64
65 ui::ModalType GetModalType() const override { 63 ui::ModalType GetModalType() const override {
66 return system_modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE; 64 return system_modal_ ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE;
67 } 65 }
68 66
69 private: 67 private:
70 bool system_modal_; 68 bool system_modal_;
71 69
72 DISALLOW_COPY_AND_ASSIGN(TestDelegate); 70 DISALLOW_COPY_AND_ASSIGN(TestDelegate);
73 }; 71 };
74 72
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( 1047 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds(
1050 gfx::Rect(0, 400, 800, 200)); 1048 gfx::Rect(0, 400, 800, 200));
1051 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); 1049 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString());
1052 1050
1053 UpdateDisplay("600x800"); 1051 UpdateDisplay("600x800");
1054 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); 1052 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString());
1055 } 1053 }
1056 1054
1057 } // namespace test 1055 } // namespace test
1058 } // namespace ash 1056 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698