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

Unified Diff: ui/views/mus/window_manager_connection.cc

Issue 2018333002: views/mus: Add support for child widgets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 9924b2d56fed2024a57e2a4fb4968fc21991a6ca..2f18b1fdf6816d106b287f03c1d75f4f3f510263 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -68,6 +68,8 @@ NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
const std::map<std::string, std::vector<uint8_t>>& props,
const Widget::InitParams& init_params,
internal::NativeWidgetDelegate* delegate) {
+ if (init_params.type == Widget::InitParams::TYPE_CONTROL)
+ return nullptr;
sky 2016/05/31 17:00:57 Add comment as to what ends up handling this.
sadrul 2016/05/31 17:25:14 Done.
std::map<std::string, std::vector<uint8_t>> properties = props;
NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
properties[mus::mojom::WindowManager::kAppID_Property] =

Powered by Google App Engine
This is Rietveld 408576698