| Index: ui/views/mus/aura_init.h
|
| diff --git a/ui/views/mus/aura_init.h b/ui/views/mus/aura_init.h
|
| index ac828327e98c1a76f45b146cf6ac6a5572fa64cb..45e8ea0906e7919e7661ec60c2ebc63da18760b9 100644
|
| --- a/ui/views/mus/aura_init.h
|
| +++ b/ui/views/mus/aura_init.h
|
| @@ -21,7 +21,7 @@ namespace font_service {
|
| class FontLoader;
|
| }
|
|
|
| -namespace shell {
|
| +namespace service_manager {
|
| class Connector;
|
| }
|
|
|
| @@ -35,14 +35,14 @@ class VIEWS_MUS_EXPORT AuraInit {
|
| // |resource_file| is the file to load strings and 1x icons from.
|
| // |resource_file_200| can be an empty string, otherwise it is the file to
|
| // load 2x icons from.
|
| - AuraInit(shell::Connector* connector,
|
| + AuraInit(service_manager::Connector* connector,
|
| const std::string& resource_file,
|
| const std::string& resource_file_200 = std::string());
|
|
|
| ~AuraInit();
|
|
|
| private:
|
| - void InitializeResources(shell::Connector* connector);
|
| + void InitializeResources(service_manager::Connector* connector);
|
|
|
| #if defined(OS_LINUX)
|
| sk_sp<font_service::FontLoader> font_loader_;
|
|
|