OLD | NEW |
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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "base/strings/string_util.h" | 6 #include "base/strings/string_util.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
9 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 9 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
10 #include "mojo/shell/public/cpp/application_delegate.h" | |
11 #include "mojo/shell/public/cpp/application_runner.h" | 10 #include "mojo/shell/public/cpp/application_runner.h" |
12 #include "mojo/shell/public/cpp/shell.h" | 11 #include "mojo/shell/public/cpp/shell.h" |
| 12 #include "mojo/shell/public/cpp/shell_client.h" |
13 #include "ui/views/background.h" | 13 #include "ui/views/background.h" |
14 #include "ui/views/controls/textfield/textfield.h" | 14 #include "ui/views/controls/textfield/textfield.h" |
15 #include "ui/views/controls/textfield/textfield_controller.h" | 15 #include "ui/views/controls/textfield/textfield_controller.h" |
16 #include "ui/views/mus/aura_init.h" | 16 #include "ui/views/mus/aura_init.h" |
17 #include "ui/views/mus/window_manager_connection.h" | 17 #include "ui/views/mus/window_manager_connection.h" |
18 #include "ui/views/widget/widget_delegate.h" | 18 #include "ui/views/widget/widget_delegate.h" |
19 #include "url/gurl.h" | 19 #include "url/gurl.h" |
20 | 20 |
21 namespace views { | 21 namespace views { |
22 class AuraInit; | 22 class AuraInit; |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 base::string16 working; | 72 base::string16 working; |
73 base::TrimWhitespace(input, base::TRIM_ALL, &working); | 73 base::TrimWhitespace(input, base::TRIM_ALL, &working); |
74 GURL url(working); | 74 GURL url(working); |
75 if (url.scheme() != "mojo" && url.scheme() != "exe") | 75 if (url.scheme() != "mojo" && url.scheme() != "exe") |
76 working = base::ASCIIToUTF16("mojo:") + working; | 76 working = base::ASCIIToUTF16("mojo:") + working; |
77 return base::UTF16ToUTF8(working); | 77 return base::UTF16ToUTF8(working); |
78 } | 78 } |
79 | 79 |
80 mojo::Shell* shell_; | 80 mojo::Shell* shell_; |
81 views::Textfield* prompt_; | 81 views::Textfield* prompt_; |
82 std::vector<scoped_ptr<mojo::ApplicationConnection>> connections_; | 82 std::vector<scoped_ptr<mojo::Connection>> connections_; |
83 | 83 |
84 DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI); | 84 DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI); |
85 }; | 85 }; |
86 | 86 |
87 class QuickLaunchApplicationDelegate : public mojo::ApplicationDelegate { | 87 class QuickLaunchApplicationDelegate : public mojo::ShellClient { |
88 public: | 88 public: |
89 QuickLaunchApplicationDelegate() {} | 89 QuickLaunchApplicationDelegate() {} |
90 ~QuickLaunchApplicationDelegate() override {} | 90 ~QuickLaunchApplicationDelegate() override {} |
91 | 91 |
92 private: | 92 private: |
93 // mojo::ApplicationDelegate: | 93 // mojo::ShellClient: |
94 void Initialize(mojo::Shell* shell, const std::string& url, | 94 void Initialize(mojo::Shell* shell, const std::string& url, |
95 uint32_t id) override { | 95 uint32_t id) override { |
96 tracing_.Initialize(shell, url); | 96 tracing_.Initialize(shell, url); |
97 | 97 |
98 aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak")); | 98 aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak")); |
99 views::WindowManagerConnection::Create(shell); | 99 views::WindowManagerConnection::Create(shell); |
100 | 100 |
101 views::Widget* window = views::Widget::CreateWindowWithBounds( | 101 views::Widget* window = views::Widget::CreateWindowWithBounds( |
102 new QuickLaunchUI(shell), gfx::Rect(10, 640, 0, 0)); | 102 new QuickLaunchUI(shell), gfx::Rect(10, 640, 0, 0)); |
103 window->Show(); | 103 window->Show(); |
104 } | 104 } |
105 | 105 |
106 mojo::TracingImpl tracing_; | 106 mojo::TracingImpl tracing_; |
107 scoped_ptr<views::AuraInit> aura_init_; | 107 scoped_ptr<views::AuraInit> aura_init_; |
108 | 108 |
109 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplicationDelegate); | 109 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplicationDelegate); |
110 }; | 110 }; |
111 | 111 |
112 } // namespace quick_launch | 112 } // namespace quick_launch |
113 } // namespace mash | 113 } // namespace mash |
114 | 114 |
115 MojoResult MojoMain(MojoHandle shell_handle) { | 115 MojoResult MojoMain(MojoHandle shell_handle) { |
116 mojo::ApplicationRunner runner( | 116 mojo::ApplicationRunner runner( |
117 new mash::quick_launch::QuickLaunchApplicationDelegate); | 117 new mash::quick_launch::QuickLaunchApplicationDelegate); |
118 return runner.Run(shell_handle); | 118 return runner.Run(shell_handle); |
119 } | 119 } |
OLD | NEW |