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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/mac/nsimage_cache.h" 8 #include "app/mac/nsimage_cache.h"
9 #include "app/resource_bundle.h"
10 #import "base/mac/cocoa_protocols.h" 9 #import "base/mac/cocoa_protocols.h"
11 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
12 #import "base/scoped_nsobject.h" 11 #import "base/scoped_nsobject.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/notifications/balloon.h" 13 #include "chrome/browser/notifications/balloon.h"
15 #include "chrome/browser/notifications/desktop_notification_service.h" 14 #include "chrome/browser/notifications/desktop_notification_service.h"
16 #include "chrome/browser/notifications/notification.h" 15 #include "chrome/browser/notifications/notification.h"
17 #include "chrome/browser/notifications/notification_options_menu_model.h" 16 #include "chrome/browser/notifications/notification_options_menu_model.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/renderer_host/render_view_host.h" 18 #include "chrome/browser/renderer_host/render_view_host.h"
20 #import "chrome/browser/ui/cocoa/hover_image_button.h" 19 #import "chrome/browser/ui/cocoa/hover_image_button.h"
21 #import "chrome/browser/ui/cocoa/menu_controller.h" 20 #import "chrome/browser/ui/cocoa/menu_controller.h"
22 #import "chrome/browser/ui/cocoa/notifications/balloon_view.h" 21 #import "chrome/browser/ui/cocoa/notifications/balloon_view.h"
23 #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h" 22 #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h"
24 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
25 #include "grit/theme_resources.h" 24 #include "grit/theme_resources.h"
25 #include "ui/base/resource/resource_bundle.h"
26 26
27 namespace { 27 namespace {
28 28
29 // Margin, in pixels, between the notification frame and the contents 29 // Margin, in pixels, between the notification frame and the contents
30 // of the notification. 30 // of the notification.
31 const int kTopMargin = 1; 31 const int kTopMargin = 1;
32 const int kBottomMargin = 2; 32 const int kBottomMargin = 2;
33 const int kLeftMargin = 2; 33 const int kLeftMargin = 2;
34 const int kRightMargin = 2; 34 const int kRightMargin = 2;
35 35
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 htmlContents_.reset(new BalloonViewHost(balloon_)); 199 htmlContents_.reset(new BalloonViewHost(balloon_));
200 htmlContents_->Init(); 200 htmlContents_->Init();
201 } 201 }
202 202
203 // NSWindowDelegate notification. 203 // NSWindowDelegate notification.
204 - (void)windowWillClose:(NSNotification*)notif { 204 - (void)windowWillClose:(NSNotification*)notif {
205 [self autorelease]; 205 [self autorelease];
206 } 206 }
207 207
208 @end 208 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/menu_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/options/cookies_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698