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

Unified Diff: services/ui/display/platform_screen_ozone.h

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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 | « services/ui/display/platform_screen.h ('k') | services/ui/display/platform_screen_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/platform_screen_ozone.h
diff --git a/services/ui/display/platform_screen_ozone.h b/services/ui/display/platform_screen_ozone.h
index 1928c346f81c581a4fbd4417658fccd7834c0467..bcdbdcb4e6a0c1026ab4a76675f380c656352496 100644
--- a/services/ui/display/platform_screen_ozone.h
+++ b/services/ui/display/platform_screen_ozone.h
@@ -28,14 +28,14 @@ namespace display {
class PlatformScreenOzone
: public PlatformScreen,
public ui::DisplayConfigurator::Observer,
- public shell::InterfaceFactory<mojom::DisplayController>,
+ public service_manager::InterfaceFactory<mojom::DisplayController>,
public mojom::DisplayController {
public:
PlatformScreenOzone();
~PlatformScreenOzone() override;
// PlatformScreen:
- void AddInterfaces(shell::InterfaceRegistry* registry) override;
+ void AddInterfaces(service_manager::InterfaceRegistry* registry) override;
void Init(PlatformScreenDelegate* delegate) override;
void RequestCloseDisplay(int64_t display_id) override;
int64_t GetPrimaryDisplayId() const override;
@@ -102,7 +102,7 @@ class PlatformScreenOzone
ui::MultipleDisplayState failed_new_state) override;
// mojo::InterfaceFactory<mojom::DisplayController>:
- void Create(const shell::Identity& remote_identity,
+ void Create(const service_manager::Identity& remote_identity,
mojom::DisplayControllerRequest request) override;
ui::DisplayConfigurator display_configurator_;
« no previous file with comments | « services/ui/display/platform_screen.h ('k') | services/ui/display/platform_screen_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698