Index: ash/shell.h |
diff --git a/ash/shell.h b/ash/shell.h |
index 910315c166c9c9268f972895625992ae30ea0dc9..8b437b32906b73fb5154201bb2866a07370934cd 100644 |
--- a/ash/shell.h |
+++ b/ash/shell.h |
@@ -64,9 +64,10 @@ class Insets; |
namespace ui { |
class UserActivityDetector; |
class UserActivityPowerManagerNotifier; |
-namespace devtools { |
-class UiDevToolsServer; |
} |
+ |
+namespace ui_devtools { |
+class UiDevToolsServer; |
} |
namespace views { |
@@ -726,7 +727,7 @@ class ASH_EXPORT Shell : public SessionObserver, |
std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; |
std::unique_ptr<app_list::AppList> app_list_; |
std::unique_ptr<::PrefService> pref_service_; |
- std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_; |
+ std::unique_ptr<ui_devtools::UiDevToolsServer> devtools_server_; |
std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; |
LinkHandlerModelFactory* link_handler_model_factory_; |
std::unique_ptr<PowerButtonController> power_button_controller_; |