Index: extensions/shell/browser/shell_desktop_controller.cc |
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/extensions/shell/browser/shell_desktop_controller.cc |
similarity index 94% |
rename from apps/shell/browser/shell_desktop_controller.cc |
rename to extensions/shell/browser/shell_desktop_controller.cc |
index 88f114a5500e449b1d0fb73b93b0850ec6d4b437..5cec7fe21384b32b77205374caed6f1c4ea3781c 100644 |
--- a/apps/shell/browser/shell_desktop_controller.cc |
+++ b/extensions/shell/browser/shell_desktop_controller.cc |
@@ -2,12 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "apps/shell/browser/shell_desktop_controller.h" |
+#include "extensions/shell/browser/shell_desktop_controller.h" |
-#include "apps/shell/browser/shell_app_window_controller.h" |
-#include "apps/shell/common/switches.h" |
#include "base/command_line.h" |
#include "content/public/browser/context_factory.h" |
+#include "extensions/shell/browser/shell_app_window_controller.h" |
+#include "extensions/shell/common/switches.h" |
#include "ui/aura/client/cursor_client.h" |
#include "ui/aura/client/default_capture_client.h" |
#include "ui/aura/env.h" |
@@ -36,7 +36,7 @@ |
#include "ui/display/types/chromeos/display_snapshot.h" |
#endif |
-namespace apps { |
+namespace extensions { |
namespace { |
// A simple layout manager that makes each new window fill its parent. |
@@ -78,21 +78,18 @@ class FillLayout : public aura::LayoutManager { |
class ShellNativeCursorManager : public wm::NativeCursorManager { |
public: |
explicit ShellNativeCursorManager(aura::WindowTreeHost* host) |
- : host_(host), |
- image_cursors_(new ui::ImageCursors) {} |
+ : host_(host), image_cursors_(new ui::ImageCursors) {} |
virtual ~ShellNativeCursorManager() {} |
// wm::NativeCursorManager overrides. |
- virtual void SetDisplay( |
- const gfx::Display& display, |
- wm::NativeCursorManagerDelegate* delegate) OVERRIDE { |
+ virtual void SetDisplay(const gfx::Display& display, |
+ wm::NativeCursorManagerDelegate* delegate) OVERRIDE { |
if (image_cursors_->SetDisplay(display, display.device_scale_factor())) |
SetCursor(delegate->GetCursor(), delegate); |
} |
- virtual void SetCursor( |
- gfx::NativeCursor cursor, |
- wm::NativeCursorManagerDelegate* delegate) OVERRIDE { |
+ virtual void SetCursor(gfx::NativeCursor cursor, |
+ wm::NativeCursorManagerDelegate* delegate) OVERRIDE { |
image_cursors_->SetPlatformCursor(&cursor); |
cursor.set_device_scale_factor(image_cursors_->GetScale()); |
delegate->CommitCursor(cursor); |
@@ -133,9 +130,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager { |
private: |
// Sets |cursor| as the active cursor within Aura. |
- void ApplyCursor(gfx::NativeCursor cursor) { |
- host_->SetCursor(cursor); |
- } |
+ void ApplyCursor(gfx::NativeCursor cursor) { host_->SetCursor(cursor); } |
aura::WindowTreeHost* host_; // Not owned. |
@@ -338,4 +333,4 @@ gfx::Size ShellDesktopController::GetPrimaryDisplaySize() { |
#endif |
} |
-} // namespace apps |
+} // namespace extensions |