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

Unified Diff: ui/views/touchui/touch_selection_controller_impl.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 | « ui/views/test/views_test_base.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/touchui/touch_selection_controller_impl.cc
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 9796c770bc9c47640ec69c64bd7e724bb217d1fd..9289f30f8ee752b530bc0f1f0b3cbd21c693321f 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -16,9 +16,9 @@
#include "ui/gfx/screen.h"
#include "ui/gfx/size.h"
#include "ui/views/widget/widget.h"
+#include "ui/wm/core/masked_window_targeter.h"
#include "ui/wm/core/shadow_types.h"
#include "ui/wm/core/window_animations.h"
-#include "ui/wm/public/masked_window_targeter.h"
namespace {
@@ -72,7 +72,7 @@ views::Widget* CreateTouchSelectionPopupWidget(
params.context = context;
params.delegate = widget_delegate;
widget->Init(params);
- SetShadowType(widget->GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
+ SetShadowType(widget->GetNativeView(), wm::SHADOW_TYPE_NONE);
return widget;
}
@@ -233,7 +233,7 @@ class TouchSelectionControllerImpl::EditingHandleView
void SetWidgetVisible(bool visible, bool quick) {
if (widget_->IsVisible() == visible)
return;
- corewm::SetWindowVisibilityAnimationDuration(
+ wm::SetWindowVisibilityAnimationDuration(
widget_->GetNativeView(),
base::TimeDelta::FromMilliseconds(
quick ? kSelectionHandleQuickFadeDurationMs : 0));
« no previous file with comments | « ui/views/test/views_test_base.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698