| Index: mash/browser/browser.cc
|
| diff --git a/mash/browser/browser.cc b/mash/browser/browser.cc
|
| index bd0e57854d971b93cdb935a60eddf4b580e7c364..d58fef1eac2c3c26efeddd0e149377f591f23f2c 100644
|
| --- a/mash/browser/browser.cc
|
| +++ b/mash/browser/browser.cc
|
| @@ -861,19 +861,17 @@ void Browser::RemoveWindow(views::Widget* window) {
|
|
|
| std::unique_ptr<navigation::View> Browser::CreateView() {
|
| navigation::mojom::ViewFactoryPtr factory;
|
| - connector_->ConnectToInterface("exe:navigation", &factory);
|
| + connector()->ConnectToInterface("exe:navigation", &factory);
|
| return base::WrapUnique(new navigation::View(std::move(factory)));
|
| }
|
|
|
| -void Browser::OnStart(shell::Connector* connector,
|
| - const shell::Identity& identity,
|
| - uint32_t id) {
|
| - connector_ = connector;
|
| - tracing_.Initialize(connector, identity.name());
|
| +void Browser::OnStart(const shell::Identity& identity) {
|
| + tracing_.Initialize(connector(), identity.name());
|
|
|
| - aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
|
| + aura_init_.reset(
|
| + new views::AuraInit(connector(), "views_mus_resources.pak"));
|
| window_manager_connection_ =
|
| - views::WindowManagerConnection::Create(connector, identity);
|
| + views::WindowManagerConnection::Create(connector(), identity);
|
| }
|
|
|
| bool Browser::OnConnect(shell::Connection* connection) {
|
|
|