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 "mash/quick_launch/quick_launch_application.h" | 5 #include "mash/quick_launch/quick_launch_application.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 std::vector<scoped_ptr<mojo::Connection>> connections_; | 83 std::vector<scoped_ptr<mojo::Connection>> connections_; |
84 | 84 |
85 DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI); | 85 DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI); |
86 }; | 86 }; |
87 | 87 |
88 QuickLaunchApplication::QuickLaunchApplication() {} | 88 QuickLaunchApplication::QuickLaunchApplication() {} |
89 QuickLaunchApplication::~QuickLaunchApplication() {} | 89 QuickLaunchApplication::~QuickLaunchApplication() {} |
90 | 90 |
91 void QuickLaunchApplication::Initialize(mojo::Shell* shell, | 91 void QuickLaunchApplication::Initialize(mojo::Shell* shell, |
92 const std::string& url, | 92 const std::string& url, |
93 uint32_t id) { | 93 uint32_t id, |
| 94 uint32_t user_id) { |
94 tracing_.Initialize(shell, url); | 95 tracing_.Initialize(shell, url); |
95 | 96 |
96 aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak")); | 97 aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak")); |
97 views::WindowManagerConnection::Create(shell); | 98 views::WindowManagerConnection::Create(shell); |
98 | 99 |
99 views::Widget* window = views::Widget::CreateWindowWithBounds( | 100 views::Widget* window = views::Widget::CreateWindowWithBounds( |
100 new QuickLaunchUI(shell), gfx::Rect(10, 640, 0, 0)); | 101 new QuickLaunchUI(shell), gfx::Rect(10, 640, 0, 0)); |
101 window->Show(); | 102 window->Show(); |
102 } | 103 } |
103 | 104 |
104 bool QuickLaunchApplication::AcceptConnection(mojo::Connection* connection) { | 105 bool QuickLaunchApplication::AcceptConnection(mojo::Connection* connection) { |
105 return true; | 106 return true; |
106 } | 107 } |
107 | 108 |
108 } // namespace quick_launch | 109 } // namespace quick_launch |
109 } // namespace mash | 110 } // namespace mash |
OLD | NEW |