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

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

Issue 1994763002: Wires up WorkspaceLayoutManager in mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: data deps 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 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/platform_window_mus.h" 5 #include "ui/views/mus/platform_window_mus.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "components/bitmap_uploader/bitmap_uploader.h" 9 #include "components/bitmap_uploader/bitmap_uploader.h"
10 #include "components/mus/public/cpp/property_type_converters.h" 10 #include "components/mus/public/cpp/property_type_converters.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #if defined(OS_WIN) || defined(OS_ANDROID) 79 #if defined(OS_WIN) || defined(OS_ANDROID)
80 gfx::AcceleratedWidget accelerated_widget = 80 gfx::AcceleratedWidget accelerated_widget =
81 reinterpret_cast<gfx::AcceleratedWidget>(accelerated_widget_count++); 81 reinterpret_cast<gfx::AcceleratedWidget>(accelerated_widget_count++);
82 #else 82 #else
83 gfx::AcceleratedWidget accelerated_widget = 83 gfx::AcceleratedWidget accelerated_widget =
84 static_cast<gfx::AcceleratedWidget>(accelerated_widget_count++); 84 static_cast<gfx::AcceleratedWidget>(accelerated_widget_count++);
85 #endif 85 #endif
86 delegate_->OnAcceleratedWidgetAvailable( 86 delegate_->OnAcceleratedWidgetAvailable(
87 accelerated_widget, mus_window_->viewport_metrics().device_pixel_ratio); 87 accelerated_widget, mus_window_->viewport_metrics().device_pixel_ratio);
88 88
89 bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(mus_window_)); 89 if (connector) {
90 bitmap_uploader_->Init(connector); 90 bitmap_uploader_.reset(new bitmap_uploader::BitmapUploader(mus_window_));
91 prop_.reset(new ui::ViewProp( 91 bitmap_uploader_->Init(connector);
92 accelerated_widget, bitmap_uploader::kBitmapUploaderForAcceleratedWidget, 92 prop_.reset(
93 bitmap_uploader_.get())); 93 new ui::ViewProp(accelerated_widget,
94 bitmap_uploader::kBitmapUploaderForAcceleratedWidget,
95 bitmap_uploader_.get()));
96 }
94 } 97 }
95 98
96 PlatformWindowMus::~PlatformWindowMus() { 99 PlatformWindowMus::~PlatformWindowMus() {
97 if (!mus_window_) 100 if (!mus_window_)
98 return; 101 return;
99 mus_window_->set_input_event_handler(nullptr); 102 mus_window_->set_input_event_handler(nullptr);
100 } 103 }
101 104
102 void PlatformWindowMus::Show() {} 105 void PlatformWindowMus::Show() {}
103 106
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 163
161 std::unique_ptr<ui::Event> event = ui::Event::Clone(event_in); 164 std::unique_ptr<ui::Event> event = ui::Event::Clone(event_in);
162 delegate_->DispatchEvent(event.get()); 165 delegate_->DispatchEvent(event.get());
163 // NOTE: |this| may be deleted. 166 // NOTE: |this| may be deleted.
164 167
165 ack_handler.set_handled(event->handled()); 168 ack_handler.set_handled(event->handled());
166 // |ack_handler| acks the event on destruction if necessary. 169 // |ack_handler| acks the event on destruction if necessary.
167 } 170 }
168 171
169 } // namespace views 172 } // 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