Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: ash/shell.h

Issue 2899783002: Move DevTools out of ash and turn it to a component. (Closed)
Patch Set: add README.md Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/devtools/window_element.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ash/devtools/window_element.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698