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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
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_OPAQUE_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/view_ids.h" 11 #include "chrome/browser/ui/view_ids.h"
11 #include "chrome/browser/ui/views/frame/avatar_button_manager.h" 12 #include "chrome/browser/ui/views/frame/avatar_button_manager.h"
12 #include "chrome/browser/ui/views/frame/browser_frame.h" 13 #include "chrome/browser/ui/views/frame/browser_frame.h"
13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 14 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
14 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegat e.h" 15 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegat e.h"
15 #include "chrome/browser/ui/views/tab_icon_view_model.h" 16 #include "chrome/browser/ui/views/tab_icon_view_model.h"
16 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
17 #include "ui/views/controls/button/menu_button_listener.h" 18 #include "ui/views/controls/button/menu_button_listener.h"
18 #include "ui/views/window/non_client_view.h" 19 #include "ui/views/window/non_client_view.h"
19 20
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 views::ImageButton* close_button_; 166 views::ImageButton* close_button_;
166 167
167 // The window icon and title. 168 // The window icon and title.
168 TabIconView* window_icon_; 169 TabIconView* window_icon_;
169 views::Label* window_title_; 170 views::Label* window_title_;
170 171
171 // Wrapper around the in-frame avatar switcher. 172 // Wrapper around the in-frame avatar switcher.
172 AvatarButtonManager profile_switcher_; 173 AvatarButtonManager profile_switcher_;
173 174
174 // Background painter for the window frame. 175 // Background painter for the window frame.
175 scoped_ptr<views::FrameBackground> frame_background_; 176 std::unique_ptr<views::FrameBackground> frame_background_;
176 177
177 // Observer that handles platform dependent configuration. 178 // Observer that handles platform dependent configuration.
178 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_; 179 std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
179 180
180 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 181 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
181 }; 182 };
182 183
183 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 184 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698