Eliminate ash::internal namespace

Plus obvious style nit fixes.

BUG=None
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/224113005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261522 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 19 deletions

diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc
index a974947..a47ddce 100644
--- a/ash/screensaver/screensaver_view.cc
+++ b/ash/screensaver/screensaver_view.cc
@@ -21,7 +21,7 @@ using content::BrowserThread;
 
 namespace {
 
-ash::internal::ScreensaverView* g_instance = NULL;
+ash::ScreensaverView* g_instance = NULL;
 
 // Do not restart the screensaver again if it has
 // terminated kMaxTerminations times already.
@@ -31,19 +31,11 @@ const int kMaxTerminations = 3;
 
 namespace ash {
 
-void ShowScreensaver(const GURL& url) {
-  internal::ScreensaverView::ShowScreensaver(url);
-}
-
-void CloseScreensaver() {
-  internal::ScreensaverView::CloseScreensaver();
-}
+void ShowScreensaver(const GURL& url) { ScreensaverView::ShowScreensaver(url); }
 
-bool IsScreensaverShown() {
-  return internal::ScreensaverView::IsScreensaverShown();
-}
+void CloseScreensaver() { ScreensaverView::CloseScreensaver(); }
 
-namespace internal {
+bool IsScreensaverShown() { return ScreensaverView::IsScreensaverShown(); }
 
 // static
 void ScreensaverView::ShowScreensaver(const GURL& url) {
@@ -166,5 +158,4 @@ ScreensaverView* ScreensaverView::GetInstance() {
   return g_instance;
 }
 
-}  // namespace internal
 }  // namespace ash
diff --git a/ash/screensaver/screensaver_view.h b/ash/screensaver/screensaver_view.h
index cb565b8..1a01aa9 100644
--- a/ash/screensaver/screensaver_view.h
+++ b/ash/screensaver/screensaver_view.h
@@ -32,8 +32,6 @@ ASH_WITH_CONTENT_EXPORT bool IsScreensaverShown();
 typedef
     base::Callback<views::WebView*(content::BrowserContext*)> WebViewFactory;
 
-namespace internal {
-
 // Shows a URL as a screensaver. The screensaver window is fullscreen,
 // always on top of every other window and will reload the URL if the
 // renderer crashes for any reason.
@@ -88,7 +86,6 @@ class ScreensaverView : public views::WidgetDelegateView,
   DISALLOW_COPY_AND_ASSIGN(ScreensaverView);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SCREENSAVER_SCREENSAVER_VIEW_H_
diff --git a/ash/screensaver/screensaver_view_unittest.cc b/ash/screensaver/screensaver_view_unittest.cc
index 0901ba4..19be19e 100644
--- a/ash/screensaver/screensaver_view_unittest.cc
+++ b/ash/screensaver/screensaver_view_unittest.cc
@@ -30,15 +30,14 @@ class ScreensaverViewTest : public ash::test::AshTestBase {
   }
 
   void ExpectOpenScreensaver() {
-    internal::ScreensaverView* screensaver =
-        internal::ScreensaverView::GetInstance();
+    ScreensaverView* screensaver = ScreensaverView::GetInstance();
     EXPECT_TRUE(screensaver != NULL);
     if (!screensaver) return;
     EXPECT_TRUE(screensaver->IsScreensaverShowingURL(url_));
   }
 
   void ExpectClosedScreensaver() {
-    EXPECT_TRUE(internal::ScreensaverView::GetInstance() == NULL);
+    EXPECT_TRUE(ScreensaverView::GetInstance() == NULL);
   }
 
  protected: