| Index: ash/screensaver/screensaver_view.cc
|
| diff --git a/ash/screensaver/screensaver_view.cc b/ash/screensaver/screensaver_view.cc
|
| index a9749473c9220737480f6d2002229cac6b6ccb32..a47ddced00a3e00ea3f6bf70bc2a46dcaa3fea9f 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
|
|
|