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

Unified Diff: ash/common/system/tray/system_tray_controller.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 | « ash/common/shell_delegate.h ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_controller.h
diff --git a/ash/common/system/tray/system_tray_controller.h b/ash/common/system/tray/system_tray_controller.h
index 442ba0e0542f6a5f8cca90389db39038dd7031e4..fda64b6fd77fcd1216961ce4876fe3e20a07bcdc 100644
--- a/ash/common/system/tray/system_tray_controller.h
+++ b/ash/common/system/tray/system_tray_controller.h
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-namespace shell {
+namespace service_manager {
class Connector;
}
@@ -34,7 +34,7 @@ namespace ash {
class ASH_EXPORT SystemTrayController
: NON_EXPORTED_BASE(public mojom::SystemTray) {
public:
- explicit SystemTrayController(shell::Connector* connector);
+ explicit SystemTrayController(service_manager::Connector* connector);
~SystemTrayController() override;
base::HourClockType hour_clock_type() const { return hour_clock_type_; }
@@ -71,7 +71,7 @@ class ASH_EXPORT SystemTrayController
void SetUse24HourClock(bool use_24_hour) override;
// May be null in unit tests.
- shell::Connector* connector_;
+ service_manager::Connector* connector_;
// Client interface in chrome browser. Only bound on Chrome OS.
mojom::SystemTrayClientPtr system_tray_client_;
« no previous file with comments | « ash/common/shell_delegate.h ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698