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

Side by Side Diff: ui/views/mus/window_manager_connection.cc

Issue 1423133003: Routes calls to WM through WS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no braces Created 5 years, 1 month 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
« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/views/mus/window_manager_connection.h" 5 #include "ui/views/mus/window_manager_connection.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/threading/thread_local.h" 8 #include "base/threading/thread_local.h"
9 #include "components/mus/public/cpp/window_tree_connection.h" 9 #include "components/mus/public/cpp/window_tree_connection.h"
10 #include "components/mus/public/interfaces/window_tree.mojom.h" 10 #include "components/mus/public/interfaces/window_tree.mojom.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 app, "views_mus_resources.pak", 118 app, "views_mus_resources.pak",
119 GetDisplaysFromWindowManager(&window_manager_))); 119 GetDisplaysFromWindowManager(&window_manager_)));
120 } 120 }
121 121
122 WindowManagerConnection::~WindowManagerConnection() {} 122 WindowManagerConnection::~WindowManagerConnection() {}
123 123
124 NativeWidget* WindowManagerConnection::CreateNativeWidget( 124 NativeWidget* WindowManagerConnection::CreateNativeWidget(
125 internal::NativeWidgetDelegate* delegate) { 125 internal::NativeWidgetDelegate* delegate) {
126 NativeWidgetMus* native_widget = 126 NativeWidgetMus* native_widget =
127 new NativeWidgetMus(delegate, app_->shell(), CreateWindow()); 127 new NativeWidgetMus(delegate, app_->shell(), CreateWindow());
128 native_widget->set_window_manager(window_manager_.get());
129 return native_widget; 128 return native_widget;
130 } 129 }
131 130
132 void WindowManagerConnection::OnBeforeWidgetInit( 131 void WindowManagerConnection::OnBeforeWidgetInit(
133 Widget::InitParams* params, 132 Widget::InitParams* params,
134 internal::NativeWidgetDelegate* delegate) {} 133 internal::NativeWidgetDelegate* delegate) {}
135 134
136 void WindowManagerConnection::OnEmbed(mus::Window* root) {} 135 void WindowManagerConnection::OnEmbed(mus::Window* root) {}
137 void WindowManagerConnection::OnConnectionLost( 136 void WindowManagerConnection::OnConnectionLost(
138 mus::WindowTreeConnection* connection) {} 137 mus::WindowTreeConnection* connection) {}
139 138
140 #if defined(OS_WIN) 139 #if defined(OS_WIN)
141 HICON WindowManagerConnection::GetSmallWindowIcon() const { 140 HICON WindowManagerConnection::GetSmallWindowIcon() const {
142 return nullptr; 141 return nullptr;
143 } 142 }
144 #endif 143 #endif
145 144
146 } // namespace views 145 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698