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

Unified Diff: mash/example/window_type_launcher/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: mash/example/window_type_launcher/window_type_launcher.cc
diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
index 0ec6d5b06d3f194227eb19c8fe011d408e7b90a9..117b6eb6c8acea6d01db7077d90b1d7df9ce06a1 100644
--- a/mash/example/window_type_launcher/window_type_launcher.cc
+++ b/mash/example/window_type_launcher/window_type_launcher.cc
@@ -89,7 +89,6 @@ class WindowDelegateView : public views::WidgetDelegateView {
return base::ASCIIToUTF16("Window");
}
gfx::Size GetPreferredSize() const override { return gfx::Size(300, 300); }
- View* GetContentsView() override { return this; }
private:
const uint32_t traits_;
@@ -130,7 +129,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");
@@ -188,7 +186,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");
@@ -346,7 +343,6 @@ class WindowTypeLauncherView : 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("Examples: Window Builder");

Powered by Google App Engine
This is Rietveld 408576698