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

Side by Side Diff: ui/views/widget/native_widget_win.cc

Issue 7042003: Revert 85732 (broke build) - Move SystemMonitor to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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 | « content/worker/worker_main.cc ('k') | views/widget/widget_win.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/views/widget/native_widget_win.h" 5 #include "ui/views/widget/native_widget_win.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/system_monitor/system_monitor.h" 8 #include "ui/base/system_monitor/system_monitor.h"
9 #include "ui/base/view_prop.h" 9 #include "ui/base/view_prop.h"
10 #include "ui/base/win/hwnd_util.h" 10 #include "ui/base/win/hwnd_util.h"
11 #include "ui/gfx/canvas_skia.h" 11 #include "ui/gfx/canvas_skia.h"
12 #include "ui/gfx/native_theme_win.h" 12 #include "ui/gfx/native_theme_win.h"
13 #include "ui/gfx/path.h" 13 #include "ui/gfx/path.h"
14 #include "ui/views/view.h" 14 #include "ui/views/view.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace ui { 17 namespace ui {
18 namespace internal { 18 namespace internal {
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 if (parent_widget) { 661 if (parent_widget) {
662 widget = parent_widget; 662 widget = parent_widget;
663 parent_hwnd = ::GetAncestor(parent_hwnd, GA_PARENT); 663 parent_hwnd = ::GetAncestor(parent_hwnd, GA_PARENT);
664 } 664 }
665 } while (parent_hwnd != NULL && parent_widget != NULL); 665 } while (parent_hwnd != NULL && parent_widget != NULL);
666 666
667 return widget; 667 return widget;
668 } 668 }
669 669
670 } // namespace ui 670 } // namespace ui
OLDNEW
« no previous file with comments | « content/worker/worker_main.cc ('k') | views/widget/widget_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698