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

Side by Side Diff: chrome/browser/ui/extensions/extension_installed_bubble.h

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
6 #define CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ 6 #define CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 Browser* browser, 67 Browser* browser,
68 const SkBitmap& icon); 68 const SkBitmap& icon);
69 69
70 ~ExtensionInstalledBubble() override; 70 ~ExtensionInstalledBubble() override;
71 71
72 const extensions::Extension* extension() const { return extension_; } 72 const extensions::Extension* extension() const { return extension_; }
73 Browser* browser() { return browser_; } 73 Browser* browser() { return browser_; }
74 const Browser* browser() const { return browser_; } 74 const Browser* browser() const { return browser_; }
75 const SkBitmap& icon() const { return icon_; } 75 const SkBitmap& icon() const { return icon_; }
76 BubbleType type() const { return type_; } 76 BubbleType type() const { return type_; }
77 bool has_command_keybinding() const { return action_command_; } 77 bool has_command_keybinding() const { return !!action_command_; }
78 int options() const { return options_; } 78 int options() const { return options_; }
79 AnchorPosition anchor_position() const { return anchor_position_; } 79 AnchorPosition anchor_position() const { return anchor_position_; }
80 80
81 // BubbleDelegate: 81 // BubbleDelegate:
82 scoped_ptr<BubbleUi> BuildBubbleUi() override; 82 scoped_ptr<BubbleUi> BuildBubbleUi() override;
83 bool ShouldClose(BubbleCloseReason reason) const override; 83 bool ShouldClose(BubbleCloseReason reason) const override;
84 std::string GetName() const override; 84 std::string GetName() const override;
85 85
86 // Returns false if the bubble could not be shown immediately, because of an 86 // Returns false if the bubble could not be shown immediately, because of an
87 // animation (eg. adding a new browser action to the toolbar). 87 // animation (eg. adding a new browser action to the toolbar).
(...skipping 19 matching lines...) Expand all
107 // The location where the bubble should be anchored. 107 // The location where the bubble should be anchored.
108 AnchorPosition anchor_position_; 108 AnchorPosition anchor_position_;
109 109
110 // The command to execute the extension action, if one exists. 110 // The command to execute the extension action, if one exists.
111 scoped_ptr<extensions::Command> action_command_; 111 scoped_ptr<extensions::Command> action_command_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(ExtensionInstalledBubble); 113 DISALLOW_COPY_AND_ASSIGN(ExtensionInstalledBubble);
114 }; 114 };
115 115
116 #endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_ 116 #endif // CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698