summaryrefslogtreecommitdiffstats
path: root/views/widget
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-31 20:39:02 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-31 20:39:02 +0000
commitfd85ad650d68309b965dbc9f3d6823cf2754349c (patch)
tree28b98629e02b2e05ec74272146f249ca62a164da /views/widget
parentce072a7181ea5d58133e33654133236f5d9f5551 (diff)
downloadchromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.zip
chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.gz
chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.bz2
Move app/win_util to app/win and fix the namespace usage.
Split out the two classes: ScopedComInitializer and ScopedCOMem (which I renamed) to separate files. I removed the win_util_path file which had one function in it and moved the function to win_util. Somehow, this was getting picked up by the nacl64 build and the call in sandbox_policy was then not being defined. I just implemented the function in-plcae since it's just a simple wrapper around a Windows API call. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6013009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
-rw-r--r--views/widget/tooltip_manager_win.cc6
-rw-r--r--views/widget/widget_win.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc
index 8e51e64..b7b3a09 100644
--- a/views/widget/tooltip_manager_win.cc
+++ b/views/widget/tooltip_manager_win.cc
@@ -8,7 +8,7 @@
#include <limits>
#include "app/l10n_util_win.h"
-#include "app/win_util.h"
+#include "app/win/win_util.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -228,7 +228,7 @@ bool TooltipManagerWin::SetTooltipPosition(int text_x, int text_y) {
// doesn't, return false so that windows positions the tooltip at the
// default location.
gfx::Rect monitor_bounds =
- win_util::GetMonitorBoundsForRect(gfx::Rect(bounds.left,bounds.right,
+ app::win::GetMonitorBoundsForRect(gfx::Rect(bounds.left,bounds.right,
0, 0));
if (!monitor_bounds.Contains(gfx::Rect(bounds))) {
return false;
@@ -356,7 +356,7 @@ void TooltipManagerWin::ShowKeyboardTooltip(View* focused_view) {
screen_point.y() + focused_bounds.height() +
line_count * tooltip_height_ };
gfx::Rect monitor_bounds =
- win_util::GetMonitorBoundsForRect(gfx::Rect(rect_bounds));
+ app::win::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,
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index a5ea141..8bf6a3f 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -9,7 +9,7 @@
#include "app/system_monitor.h"
#include "app/view_prop.h"
#include "app/win/hwnd_util.h"
-#include "app/win_util.h"
+#include "app/win/win_util.h"
#include "base/string_util.h"
#include "gfx/canvas_skia.h"
#include "gfx/native_theme_win.h"
@@ -389,7 +389,7 @@ bool WidgetWin::IsVisible() const {
}
bool WidgetWin::IsActive() const {
- return win_util::IsWindowActive(hwnd());
+ return app::win::IsWindowActive(hwnd());
}
bool WidgetWin::IsAccessibleWidget() const {