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

Unified Diff: ash/test/child_modal_window.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 side-by-side diff with in-line comments
Download patch
Index: ash/test/child_modal_window.cc
diff --git a/ash/test/child_modal_window.cc b/ash/test/child_modal_window.cc
index 40ab94e843469e41c01c14746fea7eab1039c812..fdee9f18373a5b8927b9b93aa3e321aa67043149 100644
--- a/ash/test/child_modal_window.cc
+++ b/ash/test/child_modal_window.cc
@@ -65,7 +65,6 @@ class ChildModalWindow : public views::WidgetDelegateView {
gfx::Size GetPreferredSize() const override;
// Overridden from WidgetDelegate:
- View* GetContentsView() override;
base::string16 GetWindowTitle() const override;
bool CanResize() const override;
ui::ModalType GetModalType() const override;
@@ -90,10 +89,6 @@ gfx::Size ChildModalWindow::GetPreferredSize() const {
return gfx::Size(kChildWindowWidth, kChildWindowHeight);
}
-views::View* ChildModalWindow::GetContentsView() {
- return this;
-}
-
base::string16 ChildModalWindow::GetWindowTitle() const {
return base::ASCIIToUTF16("Examples: Child Modal Window");
}
@@ -154,10 +149,6 @@ Widget* ChildModalParent::CreateChild() {
return child;
}
-views::View* ChildModalParent::GetContentsView() {
- return this;
-}
-
base::string16 ChildModalParent::GetWindowTitle() const {
return base::ASCIIToUTF16("Examples: Child Modal Parent");
}

Powered by Google App Engine
This is Rietveld 408576698