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

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

Issue 1691493002: Revise comments on various Shell interfaces. Make some methods private on ShellConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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 | « mojo/shell/public/cpp/shell_connection.h ('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/test/platform_test_helper.h" 5 #include "ui/views/test/platform_test_helper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "mojo/shell/background/background_shell.h" 8 #include "mojo/shell/background/background_shell.h"
9 #include "mojo/shell/public/cpp/shell_client.h" 9 #include "mojo/shell/public/cpp/shell_client.h"
10 #include "mojo/shell/public/cpp/shell_connection.h" 10 #include "mojo/shell/public/cpp/shell_connection.h"
(...skipping 20 matching lines...) Expand all
31 31
32 background_shell_.reset(new mojo::shell::BackgroundShell); 32 background_shell_.reset(new mojo::shell::BackgroundShell);
33 background_shell_->Init(); 33 background_shell_->Init();
34 shell_client_.reset(new DefaultShellClient); 34 shell_client_.reset(new DefaultShellClient);
35 shell_connection_.reset(new mojo::ShellConnection( 35 shell_connection_.reset(new mojo::ShellConnection(
36 shell_client_.get(), 36 shell_client_.get(),
37 background_shell_->CreateShellClientRequest(GURL("mojo://test-app")))); 37 background_shell_->CreateShellClientRequest(GURL("mojo://test-app"))));
38 shell_connection_->WaitForInitialize(); 38 shell_connection_->WaitForInitialize();
39 // ui/views/mus requires a WindowManager running, for now use the desktop 39 // ui/views/mus requires a WindowManager running, for now use the desktop
40 // one. 40 // one.
41 shell_connection_->Connect("mojo:desktop_wm"); 41 mojo::Shell* shell = shell_connection_.get();
42 shell->Connect("mojo:desktop_wm");
42 WindowManagerConnection::Create(shell_connection_.get()); 43 WindowManagerConnection::Create(shell_connection_.get());
43 } 44 }
44 45
45 ~PlatformTestHelperMus() override { 46 ~PlatformTestHelperMus() override {
46 WindowManagerConnection::Reset(); 47 WindowManagerConnection::Reset();
47 // |app_| has a reference to us, destroy it while we are still valid. 48 // |app_| has a reference to us, destroy it while we are still valid.
48 shell_connection_.reset(); 49 shell_connection_.reset();
49 } 50 }
50 51
51 private: 52 private:
52 scoped_ptr<mojo::shell::BackgroundShell> background_shell_; 53 scoped_ptr<mojo::shell::BackgroundShell> background_shell_;
53 scoped_ptr<mojo::ShellConnection> shell_connection_; 54 scoped_ptr<mojo::ShellConnection> shell_connection_;
54 scoped_ptr<DefaultShellClient> shell_client_; 55 scoped_ptr<DefaultShellClient> shell_client_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus); 57 DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
57 }; 58 };
58 59
59 } // namespace 60 } // namespace
60 61
61 // static 62 // static
62 scoped_ptr<PlatformTestHelper> PlatformTestHelper::Create() { 63 scoped_ptr<PlatformTestHelper> PlatformTestHelper::Create() {
63 return make_scoped_ptr(new PlatformTestHelperMus); 64 return make_scoped_ptr(new PlatformTestHelperMus);
64 } 65 }
65 66
66 } // namespace views 67 } // namespace views
OLDNEW
« no previous file with comments | « mojo/shell/public/cpp/shell_connection.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698