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

Side by Side Diff: ui/ozone/platform/caca/ozone_platform_caca.cc

Issue 1528373002: Replace Pass() with std::move in ui/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ozone/platform/caca/ozone_platform_caca.h" 5 #include "ui/ozone/platform/caca/ozone_platform_caca.h"
6 6
7 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 7 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h" 8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
9 #include "ui/ozone/common/native_display_delegate_ozone.h" 9 #include "ui/ozone/common/native_display_delegate_ozone.h"
10 #include "ui/ozone/common/stub_overlay_manager.h" 10 #include "ui/ozone/common/stub_overlay_manager.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override { 49 scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override {
50 return nullptr; // no input injection support. 50 return nullptr; // no input injection support.
51 } 51 }
52 scoped_ptr<PlatformWindow> CreatePlatformWindow( 52 scoped_ptr<PlatformWindow> CreatePlatformWindow(
53 PlatformWindowDelegate* delegate, 53 PlatformWindowDelegate* delegate,
54 const gfx::Rect& bounds) override { 54 const gfx::Rect& bounds) override {
55 scoped_ptr<CacaWindow> caca_window(new CacaWindow( 55 scoped_ptr<CacaWindow> caca_window(new CacaWindow(
56 delegate, window_manager_.get(), event_source_.get(), bounds)); 56 delegate, window_manager_.get(), event_source_.get(), bounds));
57 if (!caca_window->Initialize()) 57 if (!caca_window->Initialize())
58 return nullptr; 58 return nullptr;
59 return caca_window.Pass(); 59 return std::move(caca_window);
spang 2015/12/16 17:25:32 Unnecessary move.
mkollaro 2015/12/17 12:02:37 Done.
60 } 60 }
61 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { 61 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
62 return make_scoped_ptr(new NativeDisplayDelegateOzone()); 62 return make_scoped_ptr(new NativeDisplayDelegateOzone());
63 } 63 }
64 base::ScopedFD OpenClientNativePixmapDevice() const override { 64 base::ScopedFD OpenClientNativePixmapDevice() const override {
65 return base::ScopedFD(); 65 return base::ScopedFD();
66 } 66 }
67 67
68 void InitializeUI() override { 68 void InitializeUI() override {
69 window_manager_.reset(new CacaWindowManager); 69 window_manager_.reset(new CacaWindowManager);
(...skipping 22 matching lines...) Expand all
92 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); 92 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
93 }; 93 };
94 94
95 } // namespace 95 } // namespace
96 96
97 OzonePlatform* CreateOzonePlatformCaca() { 97 OzonePlatform* CreateOzonePlatformCaca() {
98 return new OzonePlatformCaca; 98 return new OzonePlatformCaca;
99 } 99 }
100 100
101 } // namespace ui 101 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698