| Index: ui/views/mus/aura_init.cc
|
| diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
|
| index 6a98706676ca76593e528db6315f80ae334f80b7..0b44e720385ffab2c18bffb0f32084973fa0f2c8 100644
|
| --- a/ui/views/mus/aura_init.cc
|
| +++ b/ui/views/mus/aura_init.cc
|
| @@ -50,7 +50,8 @@ class MusViewsDelegate : public ViewsDelegate {
|
|
|
| } // namespace
|
|
|
| -AuraInit::AuraInit(mojo::Connector* connector, const std::string& resource_file)
|
| +AuraInit::AuraInit(shell::Connector* connector,
|
| + const std::string& resource_file)
|
| : resource_file_(resource_file),
|
| env_(aura::Env::CreateInstance()),
|
| views_delegate_(new MusViewsDelegate) {
|
| @@ -71,7 +72,7 @@ AuraInit::~AuraInit() {
|
| #endif
|
| }
|
|
|
| -void AuraInit::InitializeResources(mojo::Connector* connector) {
|
| +void AuraInit::InitializeResources(shell::Connector* connector) {
|
| if (ui::ResourceBundle::HasSharedInstance())
|
| return;
|
| resource_provider::ResourceLoader resource_loader(
|
|
|