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

Unified Diff: ui/base/win/window_impl.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 | « ui/base/win/window_impl.h ('k') | views/controls/menu/menu_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/win/window_impl.cc
===================================================================
--- ui/base/win/window_impl.cc (revision 0)
+++ ui/base/win/window_impl.cc (working copy)
@@ -1,17 +1,16 @@
-// 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 "app/win/window_impl.h"
+#include "ui/base/win/window_impl.h"
#include <list>
-#include "app/win/hwnd_util.h"
+#include "ui/base/win/hwnd_util.h"
#include "base/singleton.h"
#include "base/string_number_conversions.h"
-namespace app {
-namespace win {
+namespace ui {
static const DWORD kWindowDefaultChildStyle =
WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
@@ -150,7 +149,7 @@
DCHECK(hwnd_);
// The window procedure should have set the data for us.
- DCHECK(app::win::GetWindowUserData(hwnd_) == this);
+ DCHECK(ui::GetWindowUserData(hwnd_) == this);
}
HICON WindowImpl::GetDefaultWindowIcon() const {
@@ -187,13 +186,13 @@
CREATESTRUCT* cs = reinterpret_cast<CREATESTRUCT*>(l_param);
WindowImpl* window = reinterpret_cast<WindowImpl*>(cs->lpCreateParams);
DCHECK(window);
- app::win::SetWindowUserData(hwnd, window);
+ ui::SetWindowUserData(hwnd, window);
window->hwnd_ = hwnd;
return TRUE;
}
WindowImpl* window = reinterpret_cast<WindowImpl*>(
- app::win::GetWindowUserData(hwnd));
+ ui::GetWindowUserData(hwnd));
if (!window)
return 0;
@@ -228,5 +227,4 @@
return name;
}
-} // namespace win
-} // namespace app
+} // namespace ui
« no previous file with comments | « ui/base/win/window_impl.h ('k') | views/controls/menu/menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698