Eliminate ash::internal namespace

ash/wm/partial_screenshot_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/partial_screenshot_view.h"
 
 #include <algorithm>
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 
 // A self-owned object to handle the cancel and the finish of current partial
 // screenshot session.
 class PartialScreenshotView::OverlayDelegate
-    : public internal::OverlayEventFilter::Delegate,
+    : public OverlayEventFilter::Delegate,
       public views::WidgetObserver {
  public:
   OverlayDelegate() {
     Shell::GetInstance()->overlay_filter()->Activate(this);
   }
 
   void RegisterWidget(views::Widget* widget) {
     widgets_.push_back(widget);
     widget->AddObserver(this);
   }
 
   // Overridden from OverlayEventFilter::Delegate:
   virtual void Cancel() OVERRIDE {
     // Make sure the mouse_warp_mode allows warping. It can be stopped by a
     // partial screenshot view.
-    internal::MouseCursorEventFilter* mouse_cursor_filter =
+    MouseCursorEventFilter* mouse_cursor_filter =
         Shell::GetInstance()->mouse_cursor_filter();
     mouse_cursor_filter->set_mouse_warp_mode(
-        internal::MouseCursorEventFilter::WARP_ALWAYS);
+        MouseCursorEventFilter::WARP_ALWAYS);
     for (size_t i = 0; i < widgets_.size(); ++i)
       widgets_[i]->Close();
   }
 
   virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE {
     return event->key_code() == ui::VKEY_ESCAPE;
   }
 
   virtual aura::Window* GetWindow() OVERRIDE {
     // Just returns NULL because this class does not handle key events in
@@ skipping 50 matching lines @@
 }
 
 void PartialScreenshotView::Init(aura::Window* root_window) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.delegate = this;
   // The partial screenshot rectangle has to be at the real top of
   // the screen.
-  params.parent = Shell::GetContainer(
-      root_window,
-      internal::kShellWindowId_OverlayContainer);
+  params.parent =
+      Shell::GetContainer(root_window, kShellWindowId_OverlayContainer);
 
   widget->Init(params);
   widget->SetContentsView(this);
   widget->SetBounds(root_window->GetBoundsInScreen());
   widget->GetNativeView()->SetName("PartialScreenshotView");
   widget->StackAtTop();
   widget->Show();
   // Releases the mouse capture to let mouse events come to the view. This
   // will close the context menu.
   aura::client::CaptureClient* capture_client =
@@ skipping 55 matching lines @@
     canvas->DrawRect(screenshot_rect, SK_ColorWHITE);
     screenshot_rect.Inset(-1, -1, -1, -1);
     canvas->DrawRect(screenshot_rect, SK_ColorBLACK);
   }
 }
 
 bool PartialScreenshotView::OnMousePressed(const ui::MouseEvent& event) {
   // Prevent moving across displays during drag. Capturing a screenshot across
   // the displays is not supported yet.
   // TODO(mukai): remove this restriction.
-  internal::MouseCursorEventFilter* mouse_cursor_filter =
+  MouseCursorEventFilter* mouse_cursor_filter =
       Shell::GetInstance()->mouse_cursor_filter();
-  mouse_cursor_filter->set_mouse_warp_mode(
-      internal::MouseCursorEventFilter::WARP_NONE);
+  mouse_cursor_filter->set_mouse_warp_mode(MouseCursorEventFilter::WARP_NONE);
   OnSelectionStarted(event.location());
   return true;
 }
 
 bool PartialScreenshotView::OnMouseDragged(const ui::MouseEvent& event) {
   OnSelectionChanged(event.location());
   return true;
 }
 
 bool PartialScreenshotView::OnMouseWheel(const ui::MouseWheelEvent& event) {
@@ skipping 23 matching lines @@
       OnSelectionFinished();
       break;
     default:
       break;
   }
 
   event->SetHandled();
 }
 
 }  // namespace ash