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

Side by Side Diff: mash/quick_launch/quick_launch.h

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch.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 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 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 16 matching lines...) Expand all
27 public shell::InterfaceFactory<mojom::Launchable> { 27 public shell::InterfaceFactory<mojom::Launchable> {
28 public: 28 public:
29 QuickLaunch(); 29 QuickLaunch();
30 ~QuickLaunch() override; 30 ~QuickLaunch() override;
31 31
32 void RemoveWindow(views::Widget* window); 32 void RemoveWindow(views::Widget* window);
33 33
34 private: 34 private:
35 // shell::Service: 35 // shell::Service:
36 void OnStart(const shell::Identity& identity) override; 36 void OnStart(const shell::Identity& identity) override;
37 bool OnConnect(shell::Connection* connection) override; 37 bool OnConnect(const shell::Identity& remote_identity,
38 shell::InterfaceRegistry* registry) override;
38 39
39 // mojom::Launchable: 40 // mojom::Launchable:
40 void Launch(uint32_t what, mojom::LaunchMode how) override; 41 void Launch(uint32_t what, mojom::LaunchMode how) override;
41 42
42 // shell::InterfaceFactory<mojom::Launchable>: 43 // shell::InterfaceFactory<mojom::Launchable>:
43 void Create(const shell::Identity& remote_identity, 44 void Create(const shell::Identity& remote_identity,
44 mojom::LaunchableRequest request) override; 45 mojom::LaunchableRequest request) override;
45 46
46 mojo::BindingSet<mojom::Launchable> bindings_; 47 mojo::BindingSet<mojom::Launchable> bindings_;
47 std::vector<views::Widget*> windows_; 48 std::vector<views::Widget*> windows_;
48 49
49 tracing::Provider tracing_; 50 tracing::Provider tracing_;
50 std::unique_ptr<views::AuraInit> aura_init_; 51 std::unique_ptr<views::AuraInit> aura_init_;
51 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 52 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(QuickLaunch); 54 DISALLOW_COPY_AND_ASSIGN(QuickLaunch);
54 }; 55 };
55 56
56 } // namespace quick_launch 57 } // namespace quick_launch
57 } // namespace mash 58 } // namespace mash
58 59
59 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 60 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
OLDNEW
« no previous file with comments | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698