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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « ui/views/mus/native_widget_mus.h ('k') | ui/views/mus/platform_test_helper_mus.cc » ('j') | 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/native_widget_mus.h" 5 #include "ui/views/mus/native_widget_mus.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "components/mus/public/cpp/property_type_converters.h" 9 #include "components/mus/public/cpp/property_type_converters.h"
10 #include "components/mus/public/cpp/window.h" 10 #include "components/mus/public/cpp/window.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 private: 231 private:
232 NativeWidgetMus* native_widget_mus_; 232 NativeWidgetMus* native_widget_mus_;
233 233
234 DISALLOW_COPY_AND_ASSIGN(MusWindowObserver); 234 DISALLOW_COPY_AND_ASSIGN(MusWindowObserver);
235 }; 235 };
236 236
237 //////////////////////////////////////////////////////////////////////////////// 237 ////////////////////////////////////////////////////////////////////////////////
238 // NativeWidgetMus, public: 238 // NativeWidgetMus, public:
239 239
240 NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate, 240 NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
241 mojo::Connector* connector, 241 shell::Connector* connector,
242 mus::Window* window, 242 mus::Window* window,
243 mus::mojom::SurfaceType surface_type) 243 mus::mojom::SurfaceType surface_type)
244 : window_(window), 244 : window_(window),
245 native_widget_delegate_(delegate), 245 native_widget_delegate_(delegate),
246 surface_type_(surface_type), 246 surface_type_(surface_type),
247 show_state_before_fullscreen_(ui::PLATFORM_WINDOW_STATE_UNKNOWN), 247 show_state_before_fullscreen_(ui::PLATFORM_WINDOW_STATE_UNKNOWN),
248 ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), 248 ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
249 content_(new aura::Window(this)), 249 content_(new aura::Window(this)),
250 close_widget_factory_(this) { 250 close_widget_factory_(this) {
251 mus_window_observer_.reset(new MusWindowObserver(this)); 251 mus_window_observer_.reset(new MusWindowObserver(this));
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 window_tree_host_->Show(); 1007 window_tree_host_->Show();
1008 GetNativeWindow()->Show(); 1008 GetNativeWindow()->Show();
1009 } else { 1009 } else {
1010 window_tree_host_->Hide(); 1010 window_tree_host_->Hide();
1011 GetNativeWindow()->Hide(); 1011 GetNativeWindow()->Hide();
1012 } 1012 }
1013 native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible()); 1013 native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
1014 } 1014 }
1015 1015
1016 } // namespace views 1016 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/native_widget_mus.h ('k') | ui/views/mus/platform_test_helper_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698