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

Side by Side Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.h

Issue 1406403007: Eliminate HICON leaks caused by creating icons from bitmap image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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
« no previous file with comments | « base/win/scoped_gdi_object.h ('k') | chrome/browser/ui/views/frame/glass_browser_frame_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) 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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/win/scoped_gdi_object.h"
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 10 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
10 #include "ui/views/controls/button/button.h" 11 #include "ui/views/controls/button/button.h"
11 #include "ui/views/window/non_client_view.h" 12 #include "ui/views/window/non_client_view.h"
12 13
13 class BrowserView; 14 class BrowserView;
14 15
15 class GlassBrowserFrameView : public BrowserNonClientFrameView, 16 class GlassBrowserFrameView : public BrowserNonClientFrameView,
16 public views::ButtonListener { 17 public views::ButtonListener {
17 public: 18 public:
18 // Constructs a non-client view for an BrowserFrame. 19 // Constructs a non-client view for an BrowserFrame.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 100
100 // Displays the next throbber frame. 101 // Displays the next throbber frame.
101 void DisplayNextThrobberFrame(); 102 void DisplayNextThrobberFrame();
102 103
103 // The layout rect of the incognito icon, if visible. 104 // The layout rect of the incognito icon, if visible.
104 gfx::Rect incognito_bounds_; 105 gfx::Rect incognito_bounds_;
105 106
106 // The bounds of the ClientView. 107 // The bounds of the ClientView.
107 gfx::Rect client_view_bounds_; 108 gfx::Rect client_view_bounds_;
108 109
110 // The small icon created from the bitmap image of the window icon.
111 base::win::ScopedHICON small_window_icon_;
112
113 // The big icon created from the bitmap image of the window icon.
114 base::win::ScopedHICON big_window_icon_;
115
109 // Whether or not the window throbber is currently animating. 116 // Whether or not the window throbber is currently animating.
110 bool throbber_running_; 117 bool throbber_running_;
111 118
112 // The index of the current frame of the throbber animation. 119 // The index of the current frame of the throbber animation.
113 int throbber_frame_; 120 int throbber_frame_;
114 121
115 static const int kThrobberIconCount = 24; 122 static const int kThrobberIconCount = 24;
116 static HICON throbber_icons_[kThrobberIconCount]; 123 static HICON throbber_icons_[kThrobberIconCount];
117 static void InitThrobberIcons(); 124 static void InitThrobberIcons();
118 125
119 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView); 126 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);
120 }; 127 };
121 128
122 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 129 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « base/win/scoped_gdi_object.h ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698