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

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

Issue 2795883002: Eliminate OnConnect usage (Closed)
Patch Set: . Created 3 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/ozone/public/ozone_platform.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/views_mus_test_suite.h" 5 #include "ui/views/mus/views_mus_test_suite.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 if (!cmd_line->HasSwitch(name)) 48 if (!cmd_line->HasSwitch(name))
49 cmd_line->AppendSwitch(name); 49 cmd_line->AppendSwitch(name);
50 } 50 }
51 51
52 class DefaultService : public service_manager::Service { 52 class DefaultService : public service_manager::Service {
53 public: 53 public:
54 DefaultService() {} 54 DefaultService() {}
55 ~DefaultService() override {} 55 ~DefaultService() override {}
56 56
57 // service_manager::Service: 57 // service_manager::Service:
58 bool OnConnect(const service_manager::ServiceInfo& remote_info, 58 void OnBindInterface(const service_manager::ServiceInfo& source_info,
59 service_manager::InterfaceRegistry* registry) override { 59 const std::string& interface_name,
60 return false; 60 mojo::ScopedMessagePipeHandle interface_pipe) override {}
61 }
62 61
63 private: 62 private:
64 DISALLOW_COPY_AND_ASSIGN(DefaultService); 63 DISALLOW_COPY_AND_ASSIGN(DefaultService);
65 }; 64 };
66 65
67 class PlatformTestHelperMus : public PlatformTestHelper { 66 class PlatformTestHelperMus : public PlatformTestHelper {
68 public: 67 public:
69 PlatformTestHelperMus(service_manager::Connector* connector, 68 PlatformTestHelperMus(service_manager::Connector* connector,
70 const service_manager::Identity& identity) { 69 const service_manager::Identity& identity) {
71 aura::test::EnvTestHelper().SetWindowTreeClient(nullptr); 70 aura::test::EnvTestHelper().SetWindowTreeClient(nullptr);
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 ViewsTestSuite::Initialize(); 255 ViewsTestSuite::Initialize();
257 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>(); 256 service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
258 } 257 }
259 258
260 void ViewsMusTestSuite::Shutdown() { 259 void ViewsMusTestSuite::Shutdown() {
261 service_manager_connections_.reset(); 260 service_manager_connections_.reset();
262 ViewsTestSuite::Shutdown(); 261 ViewsTestSuite::Shutdown();
263 } 262 }
264 263
265 } // namespace views 264 } // namespace views
OLDNEW
« no previous file with comments | « ui/ozone/public/ozone_platform.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698