| Index: ash/common/shell_delegate.h
|
| diff --git a/ash/common/shell_delegate.h b/ash/common/shell_delegate.h
|
| index f0d61707f2ec9d927f0c47c50369e6cff4b080e0..e7f15a22450f2eb8edd2db18aa9687238a9bcade 100644
|
| --- a/ash/common/shell_delegate.h
|
| +++ b/ash/common/shell_delegate.h
|
| @@ -27,12 +27,12 @@ namespace keyboard {
|
| class KeyboardUI;
|
| }
|
|
|
| -namespace ui {
|
| -class MenuModel;
|
| +namespace service_manager {
|
| +class Connector;
|
| }
|
|
|
| -namespace shell {
|
| -class Connector;
|
| +namespace ui {
|
| +class MenuModel;
|
| }
|
|
|
| namespace views {
|
| @@ -62,7 +62,7 @@ class ASH_EXPORT ShellDelegate {
|
| virtual ~ShellDelegate() {}
|
|
|
| // Returns the connector for the mojo service manager. Returns null in tests.
|
| - virtual ::shell::Connector* GetShellConnector() const = 0;
|
| + virtual service_manager::Connector* GetShellConnector() const = 0;
|
|
|
| // Returns true if this is the first time that the shell has been run after
|
| // the system has booted. false is returned after the shell has been
|
|
|