chrome/browser/ui/cocoa/location_bar/plus_decoration.h - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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/cocoa/location_bar/plus_decoration.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 years, 5 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

« chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/location_bar/page_action_decoration.h ('k') | chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_COCOA_LOCATION_BAR_PLUS_DECORATION_H_	5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PLUS_DECORATION_H_

6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PLUS_DECORATION_H_	6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PLUS_DECORATION_H_

7	7

8 #import <Cocoa/Cocoa.h>	8 #import <Cocoa/Cocoa.h>

9	9

10 #include "base/memory/scoped_nsobject.h"	10 #include "base/mac/scoped_nsobject.h"

11 #include "chrome/browser/ui/cocoa/location_bar/button_decoration.h"	11 #include "chrome/browser/ui/cocoa/location_bar/button_decoration.h"

12 #include "chrome/browser/ui/toolbar/action_box_button_controller.h"	12 #include "chrome/browser/ui/toolbar/action_box_button_controller.h"

13	13

14 @class ActionBoxMenuBubbleController;	14 @class ActionBoxMenuBubbleController;

15 class Browser;	15 class Browser;

16 class LocationBarViewMac;	16 class LocationBarViewMac;

17	17

18 // Note: this file is under development (see crbug.com/138118).	18 // Note: this file is under development (see crbug.com/138118).

19	19

20 // Plus icon on the right side of the location bar.	20 // Plus icon on the right side of the location bar.

(...skipping 26 matching lines...) Expand all Loading...
47	47

48 // Owner of the decoration, used to obtain the menu.	48 // Owner of the decoration, used to obtain the menu.

49 LocationBarViewMac* owner_;	49 LocationBarViewMac* owner_;

50	50

51 Browser* browser_;	51 Browser* browser_;

52	52

53 ActionBoxButtonController controller_;	53 ActionBoxButtonController controller_;

54	54

55 void SetIcons(int normal_id, int hover_id, int pressed_id);	55 void SetIcons(int normal_id, int hover_id, int pressed_id);

56	56

57 scoped_nsobject<ActionBoxMenuBubbleController> menu_controller_;	57 base::scoped_nsobject<ActionBoxMenuBubbleController> menu_controller_;

58	58

59 DISALLOW_COPY_AND_ASSIGN(PlusDecoration);	59 DISALLOW_COPY_AND_ASSIGN(PlusDecoration);

60 };	60 };

61	61

62 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PLUS_DECORATION_H_	62 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PLUS_DECORATION_H_

OLD	NEW