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

Side by Side Diff: ui/views/window/custom_frame_view.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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 | « ui/views/window/custom_frame_view.h ('k') | ui/views/window/dialog_client_view.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/window/custom_frame_view.h" 5 #include "ui/views/window/custom_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
11 #include "grit/ui_strings.h" 11 #include "grit/ui_strings.h"
12 #include "ui/base/hit_test.h" 12 #include "ui/base/hit_test.h"
13 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/font.h" 16 #include "ui/gfx/font.h"
17 #include "ui/gfx/path.h" 17 #include "ui/gfx/path.h"
18 #include "ui/views/widget/widget_delegate.h"
18 #include "ui/views/window/client_view.h" 19 #include "ui/views/window/client_view.h"
19 #include "ui/views/window/window_resources.h" 20 #include "ui/views/window/window_resources.h"
20 #include "ui/views/window/window_shape.h" 21 #include "ui/views/window/window_shape.h"
21 #include "views/widget/widget_delegate.h"
22 22
23 #if defined(USE_AURA) 23 #if defined(USE_AURA)
24 #include "views/widget/native_widget_aura.h" 24 #include "ui/views/widget/native_widget_aura.h"
25 #elif defined(OS_WIN) 25 #elif defined(OS_WIN)
26 #include "views/widget/native_widget_win.h" 26 #include "ui/views/widget/native_widget_win.h"
27 #endif 27 #endif
28 28
29 namespace views { 29 namespace views {
30 30
31 // static 31 // static
32 gfx::Font* CustomFrameView::title_font_ = NULL; 32 gfx::Font* CustomFrameView::title_font_ = NULL;
33 33
34 namespace { 34 namespace {
35 // The frame border is only visible in restored mode and is hardcoded to 4 px on 35 // The frame border is only visible in restored mode and is hardcoded to 4 px on
36 // each side regardless of the system window border size. 36 // each side regardless of the system window border size.
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 title_font_ = new gfx::Font(NativeWidgetWin::GetWindowTitleFont()); 600 title_font_ = new gfx::Font(NativeWidgetWin::GetWindowTitleFont());
601 #elif defined(OS_LINUX) 601 #elif defined(OS_LINUX)
602 // TODO(ben): need to resolve what font this is. 602 // TODO(ben): need to resolve what font this is.
603 title_font_ = new gfx::Font(); 603 title_font_ = new gfx::Font();
604 #endif 604 #endif
605 initialized = true; 605 initialized = true;
606 } 606 }
607 } 607 }
608 608
609 } // namespace views 609 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/window/custom_frame_view.h ('k') | ui/views/window/dialog_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698