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

Unified Diff: ash/shell/window_type_launcher.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/shell/window_type_launcher.cc
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index b7932b875545e8aaf0391122ca34fb8c9f6a13ae..4e3692f94648849b175a9a466207f88ebbd2682a 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -77,7 +77,6 @@ class ModalWindow : public views::WidgetDelegateView,
}
// Overridden from views::WidgetDelegate:
- views::View* GetContentsView() override { return this; }
bool CanResize() const override { return true; }
base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Modal Window");
@@ -131,7 +130,6 @@ class NonModalTransient : public views::WidgetDelegateView {
gfx::Size GetPreferredSize() const override { return gfx::Size(250, 250); }
// Overridden from views::WidgetDelegate:
- views::View* GetContentsView() override { return this; }
bool CanResize() const override { return true; }
base::string16 GetWindowTitle() const override {
return base::ASCIIToUTF16("Non-Modal Transient");
@@ -240,10 +238,6 @@ bool WindowTypeLauncher::OnMousePressed(const ui::MouseEvent& event) {
return true;
}
-views::View* WindowTypeLauncher::GetContentsView() {
- return this;
-}
-
bool WindowTypeLauncher::CanResize() const {
return true;
}

Powered by Google App Engine
This is Rietveld 408576698