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

Unified Diff: wm/shell/shell_delegate_impl.cc

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Push gfx::AcceleratedWidget usage into platform specific code. Created 7 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 | « wm/shell/shell_delegate_impl.h ('k') | wm/shell/shell_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: wm/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/wm/shell/shell_delegate_impl.cc
similarity index 82%
copy from ash/shell/shell_delegate_impl.cc
copy to wm/shell/shell_delegate_impl.cc
index f7899838d83450dab34a6327550bf183850bf054..565d9950f8298ad00ad79f979214ea12da526231 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/wm/shell/shell_delegate_impl.cc
@@ -1,21 +1,21 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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/shell/shell_delegate_impl.h"
+#include "wm/shell/shell_delegate_impl.h"
#include "ash/caps_lock_delegate_stub.h"
-#include "ash/host/root_window_host_factory.h"
+#include "ash/shell/context_menu.h"
#include "ash/shell/example_factory.h"
#include "ash/shell/launcher_delegate_impl.h"
-#include "ash/shell/context_menu.h"
#include "ash/shell/toplevel_window.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/window_util.h"
#include "base/message_loop.h"
#include "ui/aura/window.h"
+#include "wm/host/root_window_host_factory.h"
-namespace ash {
+namespace wm {
namespace shell {
ShellDelegateImpl::ShellDelegateImpl()
@@ -25,13 +25,13 @@ ShellDelegateImpl::ShellDelegateImpl()
spoken_feedback_enabled_(false),
high_contrast_enabled_(false),
screen_magnifier_enabled_(false),
- screen_magnifier_type_(kDefaultMagnifierType) {
+ screen_magnifier_type_(ash::kDefaultMagnifierType) {
}
ShellDelegateImpl::~ShellDelegateImpl() {
}
-void ShellDelegateImpl::SetWatcher(WindowWatcher* watcher) {
+void ShellDelegateImpl::SetWatcher(ash::shell::WindowWatcher* watcher) {
watcher_ = watcher;
if (launcher_delegate_)
launcher_delegate_->set_watcher(watcher);
@@ -103,7 +103,7 @@ void ShellDelegateImpl::OpenMobileSetup(const std::string& service_path) {
void ShellDelegateImpl::RestoreTab() {
}
-bool ShellDelegateImpl::RotatePaneFocus(Shell::Direction direction) {
+bool ShellDelegateImpl::RotatePaneFocus(ash::Shell::Direction direction) {
return true;
}
@@ -114,11 +114,11 @@ void ShellDelegateImpl::ShowTaskManager() {
}
content::BrowserContext* ShellDelegateImpl::GetCurrentBrowserContext() {
- return Shell::GetInstance()->browser_context();
+ return ash::Shell::GetInstance()->browser_context();
}
void ShellDelegateImpl::ToggleSpokenFeedback(
- AccessibilityNotificationVisibility notify) {
+ ash::AccessibilityNotificationVisibility notify) {
spoken_feedback_enabled_ = !spoken_feedback_enabled_;
}
@@ -138,7 +138,7 @@ void ShellDelegateImpl::SetMagnifierEnabled(bool enabled) {
screen_magnifier_enabled_ = enabled;
}
-void ShellDelegateImpl::SetMagnifierType(MagnifierType type) {
+void ShellDelegateImpl::SetMagnifierType(ash::MagnifierType type) {
screen_magnifier_type_ = type;
}
@@ -146,7 +146,7 @@ bool ShellDelegateImpl::IsMagnifierEnabled() const {
return screen_magnifier_enabled_;
}
-MagnifierType ShellDelegateImpl::GetMagnifierType() const {
+ash::MagnifierType ShellDelegateImpl::GetMagnifierType() const {
return screen_magnifier_type_;
}
@@ -160,7 +160,7 @@ app_list::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() {
ash::LauncherDelegate* ShellDelegateImpl::CreateLauncherDelegate(
ash::LauncherModel* model) {
- launcher_delegate_ = new LauncherDelegateImpl(watcher_);
+ launcher_delegate_ = new ash::shell::LauncherDelegateImpl(watcher_);
return launcher_delegate_;
}
@@ -173,7 +173,7 @@ ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() {
}
ash::CapsLockDelegate* ShellDelegateImpl::CreateCapsLockDelegate() {
- return new CapsLockDelegateStub;
+ return new ash::CapsLockDelegateStub;
}
aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
@@ -183,7 +183,8 @@ aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
void ShellDelegateImpl::OpenFeedbackPage() {
}
-void ShellDelegateImpl::RecordUserMetricsAction(UserMetricsAction action) {
+void ShellDelegateImpl::RecordUserMetricsAction(
+ ash::UserMetricsAction action) {
}
void ShellDelegateImpl::HandleMediaNextTrack() {
@@ -211,10 +212,10 @@ double ShellDelegateImpl::GetSavedScreenMagnifierScale() {
}
ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) {
- return new ContextMenu(root);
+ return new ash::shell::ContextMenu(root);
}
-RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() {
+ash::RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() {
return RootWindowHostFactory::Create();
}
@@ -223,4 +224,4 @@ string16 ShellDelegateImpl::GetProductName() const {
}
} // namespace shell
-} // namespace ash
+} // namespace wm
« no previous file with comments | « wm/shell/shell_delegate_impl.h ('k') | wm/shell/shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698