chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.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

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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"	9 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"

10 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"	10 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"

(...skipping 26 matching lines...) Expand all Loading...
37 // Overridden from views::DesktopWindowTreeHostX11:	37 // Overridden from views::DesktopWindowTreeHostX11:

38 void Init(aura::Window* content_window,	38 void Init(aura::Window* content_window,

39 const views::Widget::InitParams& params) override;	39 const views::Widget::InitParams& params) override;

40 void CloseNow() override;	40 void CloseNow() override;

41	41

42 BrowserView* browser_view_;	42 BrowserView* browser_view_;

43	43

44 // Each browser frame maintains its own menu bar object because the lower	44 // Each browser frame maintains its own menu bar object because the lower

45 // level dbus protocol associates a xid to a menu bar; we can't map multiple	45 // level dbus protocol associates a xid to a menu bar; we can't map multiple

46 // xids to the same menu bar.	46 // xids to the same menu bar.

47 scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_;	47 std::unique_ptr<GlobalMenuBarX11> global_menu_bar_x11_;

48	48

49 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11);	49 DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostX11);

50 };	50 };

51	51

52 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_	52 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_

OLD	NEW