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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

Issue 10913243: extensions: Add ExtensionView interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: virtual dtor for cocoa and gtk ports Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index a405101fdee26c7125ad5691b16c8871ebb8ee91..1aeebf66860e64cd9ef33a861322c5aa30930a37 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -56,20 +56,19 @@ CGFloat Clamp(CGFloat value, CGFloat min, CGFloat max) {
- (void)onViewDidShow;
@end
-class ExtensionPopupContainer : public ExtensionViewMac::Container {
+class ExtensionPopupContainer : public ExtensionViewContainer {
public:
explicit ExtensionPopupContainer(ExtensionPopupController* controller)
: controller_(controller) {
}
- virtual void OnExtensionSizeChanged(
- ExtensionViewMac* view,
- const gfx::Size& new_size) OVERRIDE {
+ virtual void OnExtensionSizeChanged(ExtensionView* view,
+ const gfx::Size& new_size) OVERRIDE {
[controller_ onSizeChanged:
NSMakeSize(new_size.width(), new_size.height())];
}
- virtual void OnExtensionViewDidShow(ExtensionViewMac* view) OVERRIDE {
+ virtual void OnExtensionViewDidShow(ExtensionView* view) OVERRIDE {
[controller_ onViewDidShow];
}
@@ -149,7 +148,7 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
extensionView_ = host->view()->native_view();
container_.reset(new ExtensionPopupContainer(self));
- host->view()->set_container(container_.get());
+ host->view()->SetContainer(container_.get());
NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
[center addObserver:self
@@ -198,7 +197,7 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
[super windowWillClose:notification];
gPopup = nil;
if (host_->view())
- host_->view()->set_container(NULL);
+ host_->view()->SetContainer(NULL);
}
- (void)windowDidResignKey:(NSNotification*)notification {

Powered by Google App Engine
This is Rietveld 408576698