Remove app/win/win_util.h,cc etc.

views/widget/tooltip_manager_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "views/widget/tooltip_manager_win.h"
 
 #include <windowsx.h>
 #include <limits>
 
-#include "app/win/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "gfx/font.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "views/screen.h"
 #include "views/view.h"
+#include "views/widget/monitor_win.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 static int tooltip_height_ = 0;
 
 // Default timeout for the tooltip displayed using keyboard.
 // Timeout is mentioned in milliseconds.
 static const int kDefaultTimeout = 4000;
@@ skipping 193 matching lines @@
   RECT bounds = { view_loc.x() + text_x,
                   view_loc.y() + text_y,
                   view_loc.x() + text_x + tooltip_width_,
                   view_loc.y() + line_count_ * GetTooltipHeight() };
   SendMessage(tooltip_hwnd_, TTM_ADJUSTRECT, TRUE, (LPARAM)&bounds);
 
   // Make sure the rectangle completely fits on the current monitor. If it
   // doesn't, return false so that windows positions the tooltip at the
   // default location.
   gfx::Rect monitor_bounds =
-      app::win::GetMonitorBoundsForRect(gfx::Rect(bounds.left,bounds.right,
+      views::GetMonitorBoundsForRect(gfx::Rect(bounds.left,bounds.right,
                                                   0, 0));
   if (!monitor_bounds.Contains(gfx::Rect(bounds))) {
     return false;
   }
 
   ::SetWindowPos(tooltip_hwnd_, NULL, bounds.left, bounds.top, 0, 0,
                  SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);
   return true;
 }
 
@@ skipping 107 matching lines @@
   SendMessage(keyboard_tooltip_hwnd_, TTM_TRACKACTIVATE,  TRUE,
               reinterpret_cast<LPARAM>(&keyboard_toolinfo));
   if (!tooltip_height_)
     tooltip_height_ = CalcTooltipHeight();
   RECT rect_bounds = {screen_point.x(),
                       screen_point.y() + focused_bounds.height(),
                       screen_point.x() + tooltip_width,
                       screen_point.y() + focused_bounds.height() +
                       line_count * tooltip_height_ };
   gfx::Rect monitor_bounds =
-      app::win::GetMonitorBoundsForRect(gfx::Rect(rect_bounds));
+      views::GetMonitorBoundsForRect(gfx::Rect(rect_bounds));
   rect_bounds = gfx::Rect(rect_bounds).AdjustToFit(monitor_bounds).ToRECT();
   ::SetWindowPos(keyboard_tooltip_hwnd_, NULL, rect_bounds.left,
                  rect_bounds.top, 0, 0,
                  SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       keyboard_tooltip_factory_.NewRunnableMethod(
       &TooltipManagerWin::DestroyKeyboardTooltipWindow,
       keyboard_tooltip_hwnd_),
       kDefaultTimeout);
 }
 
 void TooltipManagerWin::HideKeyboardTooltip() {
   if (keyboard_tooltip_hwnd_ != NULL) {
     SendMessage(keyboard_tooltip_hwnd_, WM_CLOSE, 0, 0);
     keyboard_tooltip_hwnd_ = NULL;
   }
 }
 
 void TooltipManagerWin::DestroyKeyboardTooltipWindow(HWND window_to_destroy) {
   if (keyboard_tooltip_hwnd_ == window_to_destroy)
     HideKeyboardTooltip();
 }
 
 }  // namespace views