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

Unified Diff: views/window/window_win.cc

Issue 6254011: Move UI-relevant Windows files to ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | « views/widget/widget_win.cc ('k') | webkit/tools/test_shell/foreground_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/window_win.cc
===================================================================
--- views/window/window_win.cc (revision 71828)
+++ views/window/window_win.cc (working copy)
@@ -8,7 +8,6 @@
#include <shellapi.h>
#include "app/theme_provider.h"
-#include "app/win/hwnd_util.h"
#include "app/win/win_util.h"
#include "base/i18n/rtl.h"
#include "base/win/windows_version.h"
@@ -17,6 +16,7 @@
#include "gfx/icon_util.h"
#include "gfx/path.h"
#include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/win/hwnd_util.h"
#include "views/accessibility/view_accessibility.h"
#include "views/widget/root_view.h"
#include "views/window/client_view.h"
@@ -540,7 +540,7 @@
bool WindowWin::ShouldUseNativeFrame() const {
ThemeProvider* tp = GetThemeProvider();
if (!tp)
- return app::win::ShouldUseVistaFrame();
+ return ui::ShouldUseVistaFrame();
return tp->ShouldUseNativeFrame();
}
@@ -595,7 +595,7 @@
set_window_ex_style(CalculateWindowExStyle());
WidgetWin::Init(parent, bounds);
- app::win::SetWindowUserData(GetNativeView(), this);
+ ui::SetWindowUserData(GetNativeView(), this);
// Create the ClientView, add it to the NonClientView and add the
// NonClientView to the RootView. This will cause everything to be parented.
@@ -614,9 +614,9 @@
}
void WindowWin::SizeWindowToDefault() {
- app::win::CenterAndSizeWindow(owning_window(), GetNativeView(),
- non_client_view_->GetPreferredSize(),
- false);
+ ui::CenterAndSizeWindow(owning_window(), GetNativeView(),
+ non_client_view_->GetPreferredSize(),
+ false);
}
gfx::Insets WindowWin::GetClientAreaInsets() const {
« no previous file with comments | « views/widget/widget_win.cc ('k') | webkit/tools/test_shell/foreground_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698