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

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

Issue 115309: Remove even more ATL dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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 | « views/widget/widget_win.h ('k') | views/window/window_win.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/window/custom_frame_view.h" 5 #include "views/window/custom_frame_view.h"
6 6
7 #include "app/gfx/chrome_canvas.h" 7 #include "app/gfx/chrome_canvas.h"
8 #include "app/gfx/chrome_font.h" 8 #include "app/gfx/chrome_font.h"
9 #include "app/gfx/path.h" 9 #include "app/gfx/path.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // window (the true top in restored mode, or the top of the screen in maximized 67 // window (the true top in restored mode, or the top of the screen in maximized
68 // mode). 68 // mode).
69 const int kCaptionTopSpacing = 1; 69 const int kCaptionTopSpacing = 1;
70 } 70 }
71 71
72 /////////////////////////////////////////////////////////////////////////////// 72 ///////////////////////////////////////////////////////////////////////////////
73 // CustomFrameView, public: 73 // CustomFrameView, public:
74 74
75 CustomFrameView::CustomFrameView(Window* frame) 75 CustomFrameView::CustomFrameView(Window* frame)
76 : NonClientFrameView(), 76 : NonClientFrameView(),
77 close_button_(new ImageButton(this)), 77 ALLOW_THIS_IN_INITIALIZER_LIST(close_button_(new ImageButton(this))),
78 restore_button_(new ImageButton(this)), 78 ALLOW_THIS_IN_INITIALIZER_LIST(restore_button_(new ImageButton(this))),
79 maximize_button_(new ImageButton(this)), 79 ALLOW_THIS_IN_INITIALIZER_LIST(maximize_button_(new ImageButton(this))),
80 minimize_button_(new ImageButton(this)), 80 ALLOW_THIS_IN_INITIALIZER_LIST(minimize_button_(new ImageButton(this))),
81 system_menu_button_(new ImageButton(this)), 81 ALLOW_THIS_IN_INITIALIZER_LIST(
82 system_menu_button_(new ImageButton(this))),
82 should_show_minmax_buttons_(false), 83 should_show_minmax_buttons_(false),
83 frame_(frame) { 84 frame_(frame) {
84 InitClass(); 85 InitClass();
85 86
86 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 87 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
87 88
88 // Close button images will be set in LayoutWindowControls(). 89 // Close button images will be set in LayoutWindowControls().
89 AddChildView(close_button_); 90 AddChildView(close_button_);
90 91
91 restore_button_->SetImage(CustomButton::BS_NORMAL, 92 restore_button_->SetImage(CustomButton::BS_NORMAL,
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 title_font_ = new ChromeFont(win_util::GetWindowTitleFont()); 588 title_font_ = new ChromeFont(win_util::GetWindowTitleFont());
588 #elif defined(OS_LINUX) 589 #elif defined(OS_LINUX)
589 // TODO: need to resolve what font this is. 590 // TODO: need to resolve what font this is.
590 title_font_ = new ChromeFont(); 591 title_font_ = new ChromeFont();
591 #endif 592 #endif
592 initialized = true; 593 initialized = true;
593 } 594 }
594 } 595 }
595 596
596 } // namespace views 597 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/widget_win.h ('k') | views/window/window_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698