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

Unified Diff: chrome/browser/ui/ash/ash_util.cc

Issue 2718333002: Move ash_util functions from 'chrome' namespace to 'ash_util' namespace (Closed)
Patch Set: Rebase after https://codereview.chromium.org/2721883002 Created 3 years, 10 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 | « chrome/browser/ui/ash/ash_util.h ('k') | chrome/browser/ui/ash/system_tray_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index 7188b70b93ce369b6e9d0d51cbf858a81aedcca7..591c9d5593618da9d1cebdfa360c0e986c0f7957 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -54,10 +54,6 @@ std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
return base::MakeUnique<EmbeddedAshService>(task_runner);
}
-} // namespace ash_util
-
-namespace chrome {
-
bool ShouldOpenAshOnStartup() {
return !IsRunningInMash();
}
@@ -68,11 +64,11 @@ bool IsRunningInMash() {
bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
// When running in mash the browser doesn't handle ash accelerators.
- if (chrome::IsRunningInMash())
+ if (IsRunningInMash())
return false;
return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(
accelerator);
}
-} // namespace chrome
+} // namespace ash_util
« no previous file with comments | « chrome/browser/ui/ash/ash_util.h ('k') | chrome/browser/ui/ash/system_tray_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698