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

Side by Side Diff: views/controls/native_control.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/controls/native/native_view_host_win.cc ('k') | views/controls/progress_bar.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/controls/native_control.h" 5 #include "views/controls/native_control.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlapp.h> 8 #include <atlapp.h>
9 #include <atlcrack.h> 9 #include <atlcrack.h>
10 #include <atlframe.h> 10 #include <atlframe.h>
11 #include <atlmisc.h> 11 #include <atlmisc.h>
12 12
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "gfx/native_theme_win.h"
16 #include "ui/base/keycodes/keyboard_codes.h" 15 #include "ui/base/keycodes/keyboard_codes.h"
17 #include "ui/base/keycodes/keyboard_code_conversion_win.h" 16 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
18 #include "ui/base/l10n/l10n_util_win.h" 17 #include "ui/base/l10n/l10n_util_win.h"
19 #include "ui/base/view_prop.h" 18 #include "ui/base/view_prop.h"
20 #include "ui/base/win/hwnd_util.h" 19 #include "ui/base/win/hwnd_util.h"
20 #include "ui/gfx/native_theme_win.h"
21 #include "views/background.h" 21 #include "views/background.h"
22 #include "views/border.h" 22 #include "views/border.h"
23 #include "views/controls/native/native_view_host.h" 23 #include "views/controls/native/native_view_host.h"
24 #include "views/focus/focus_manager.h" 24 #include "views/focus/focus_manager.h"
25 #include "views/widget/widget.h" 25 #include "views/widget/widget.h"
26 26
27 using ui::ViewProp; 27 using ui::ViewProp;
28 28
29 namespace views { 29 namespace views {
30 30
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } else if (message == WM_DESTROY) { 384 } else if (message == WM_DESTROY) {
385 ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler)); 385 ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler));
386 native_control->container_->prop_.reset(); 386 native_control->container_->prop_.reset();
387 } 387 }
388 388
389 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window, 389 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
390 message, w_param, l_param); 390 message, w_param, l_param);
391 } 391 }
392 392
393 } // namespace views 393 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/native/native_view_host_win.cc ('k') | views/controls/progress_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698