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

Unified Diff: ash/wm/workspace/workspace_event_filter.cc

Issue 9226040: Renames and moves some workspace related classes to the workspace (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | « ash/wm/workspace/workspace_event_filter.h ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_event_filter.cc
===================================================================
--- ash/wm/workspace/workspace_event_filter.cc (revision 118542)
+++ ash/wm/workspace/workspace_event_filter.cc (working copy)
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/default_container_event_filter.h"
+#include "ash/wm/workspace/workspace_event_filter.h"
-#include "ash/wm/default_container_layout_manager.h"
#include "ash/wm/window_frame.h"
#include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace_layout_manager.h"
#include "ui/aura/event.h"
#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
@@ -31,19 +31,19 @@
namespace ash {
namespace internal {
-DefaultContainerEventFilter::DefaultContainerEventFilter(aura::Window* owner)
+WorkspaceEventFilter::WorkspaceEventFilter(aura::Window* owner)
: ToplevelWindowEventFilter(owner),
drag_state_(DRAG_NONE),
hovered_window_(NULL) {
}
-DefaultContainerEventFilter::~DefaultContainerEventFilter() {
+WorkspaceEventFilter::~WorkspaceEventFilter() {
}
-bool DefaultContainerEventFilter::PreHandleMouseEvent(aura::Window* target,
- aura::MouseEvent* event) {
- DefaultContainerLayoutManager* layout_manager =
- static_cast<DefaultContainerLayoutManager*>(owner()->layout_manager());
+bool WorkspaceEventFilter::PreHandleMouseEvent(aura::Window* target,
+ aura::MouseEvent* event) {
+ WorkspaceLayoutManager* layout_manager =
+ static_cast<WorkspaceLayoutManager*>(owner()->layout_manager());
DCHECK(layout_manager);
// TODO(oshima|derat): Incorporate the logic below and introduce DragObserver
@@ -95,7 +95,7 @@
return handled;
}
-bool DefaultContainerEventFilter::UpdateDragState() {
+bool WorkspaceEventFilter::UpdateDragState() {
DCHECK_EQ(DRAG_NONE, drag_state_);
switch (window_component()) {
case HTCAPTION:
@@ -118,7 +118,7 @@
return true;
}
-void DefaultContainerEventFilter::UpdateHoveredWindow(
+void WorkspaceEventFilter::UpdateHoveredWindow(
aura::Window* toplevel_window) {
if (toplevel_window == hovered_window_)
return;
« no previous file with comments | « ash/wm/workspace/workspace_event_filter.h ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698