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

Side by Side Diff: chrome/browser/ui/cocoa/notifications/balloon_controller.mm

Issue 12937008: Move HoverButton and HoverImageButton from chrome/browser/ui/cocoa/ to ui/base/cocoa. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 7 years, 9 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
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 #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" 5 #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h"
6 6
7 #include "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #import "base/memory/scoped_nsobject.h" 9 #import "base/memory/scoped_nsobject.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/notifications/balloon.h" 11 #include "chrome/browser/notifications/balloon.h"
12 #include "chrome/browser/notifications/desktop_notification_service.h" 12 #include "chrome/browser/notifications/desktop_notification_service.h"
13 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 13 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
14 #include "chrome/browser/notifications/notification.h" 14 #include "chrome/browser/notifications/notification.h"
15 #include "chrome/browser/notifications/notification_options_menu_model.h" 15 #include "chrome/browser/notifications/notification_options_menu_model.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #import "chrome/browser/ui/cocoa/hover_image_button.h"
18 #import "chrome/browser/ui/cocoa/menu_controller.h" 17 #import "chrome/browser/ui/cocoa/menu_controller.h"
19 #import "chrome/browser/ui/cocoa/notifications/balloon_view.h" 18 #import "chrome/browser/ui/cocoa/notifications/balloon_view.h"
20 #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h" 19 #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h"
21 #include "content/public/browser/render_view_host.h" 20 #include "content/public/browser/render_view_host.h"
22 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
23 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
24 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #import "ui/base/cocoa/hover_image_button.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 27
28 namespace { 28 namespace {
29 29
30 // Margin, in pixels, between the notification frame and the contents 30 // Margin, in pixels, between the notification frame and the contents
31 // of the notification. 31 // of the notification.
32 const int kTopMargin = 1; 32 const int kTopMargin = 1;
33 const int kBottomMargin = 2; 33 const int kBottomMargin = 2;
34 const int kLeftMargin = 2; 34 const int kLeftMargin = 2;
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 htmlContents_.reset(new BalloonViewHost(balloon_)); 219 htmlContents_.reset(new BalloonViewHost(balloon_));
220 htmlContents_->Init(); 220 htmlContents_->Init();
221 } 221 }
222 222
223 // NSWindowDelegate notification. 223 // NSWindowDelegate notification.
224 - (void)windowWillClose:(NSNotification*)notif { 224 - (void)windowWillClose:(NSNotification*)notif {
225 [self autorelease]; 225 [self autorelease];
226 } 226 }
227 227
228 @end 228 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698