ui/views/widget/native_widget_aura.cc - Issue 1159033008: Refactor ViewsDelegate singleton

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

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed review comments Created 5 years, 6 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

« ui/views/views_delegate.cc ('K') | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_aura.h"	5 #include "ui/views/widget/native_widget_aura.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

9 #include "third_party/skia/include/core/SkRegion.h"	9 #include "third_party/skia/include/core/SkRegion.h"

10 #include "ui/aura/client/aura_constants.h"	10 #include "ui/aura/client/aura_constants.h"

(...skipping 10 matching lines...) Expand all Loading...
21 #include "ui/base/ui_base_types.h"	21 #include "ui/base/ui_base_types.h"

22 #include "ui/compositor/layer.h"	22 #include "ui/compositor/layer.h"

23 #include "ui/events/event.h"	23 #include "ui/events/event.h"

24 #include "ui/gfx/canvas.h"	24 #include "ui/gfx/canvas.h"

25 #include "ui/gfx/font_list.h"	25 #include "ui/gfx/font_list.h"

26 #include "ui/gfx/screen.h"	26 #include "ui/gfx/screen.h"

27 #include "ui/native_theme/native_theme_aura.h"	27 #include "ui/native_theme/native_theme_aura.h"

28 #include "ui/views/drag_utils.h"	28 #include "ui/views/drag_utils.h"

29 #include "ui/views/ime/input_method_bridge.h"	29 #include "ui/views/ime/input_method_bridge.h"

30 #include "ui/views/ime/null_input_method.h"	30 #include "ui/views/ime/null_input_method.h"

31 #include "ui/views/views_delegate.h"

32 #include "ui/views/widget/drop_helper.h"	31 #include "ui/views/widget/drop_helper.h"

33 #include "ui/views/widget/native_widget_delegate.h"	32 #include "ui/views/widget/native_widget_delegate.h"

34 #include "ui/views/widget/root_view.h"	33 #include "ui/views/widget/root_view.h"

35 #include "ui/views/widget/tooltip_manager_aura.h"	34 #include "ui/views/widget/tooltip_manager_aura.h"

36 #include "ui/views/widget/widget_aura_utils.h"	35 #include "ui/views/widget/widget_aura_utils.h"

37 #include "ui/views/widget/widget_delegate.h"	36 #include "ui/views/widget/widget_delegate.h"

38 #include "ui/views/widget/window_reorderer.h"	37 #include "ui/views/widget/window_reorderer.h"

39 #include "ui/wm/core/shadow_types.h"	38 #include "ui/wm/core/shadow_types.h"

40 #include "ui/wm/core/window_animations.h"	39 #include "ui/wm/core/window_animations.h"

41 #include "ui/wm/core/window_util.h"	40 #include "ui/wm/core/window_util.h"

(...skipping 1163 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1205 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));	1204 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));

1206 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));	1205 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));

1207 return gfx::FontList(gfx::Font(caption_font));	1206 return gfx::FontList(gfx::Font(caption_font));

1208 #else	1207 #else

1209 return gfx::FontList();	1208 return gfx::FontList();

1210 #endif	1209 #endif

1211 }	1210 }

1212	1211

1213 } // namespace internal	1212 } // namespace internal

1214 } // namespace views	1213 } // namespace views

OLD	NEW