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

Side by Side Diff: chrome/browser/ui/views/notifications/balloon_view_views.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 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
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/views/notifications/balloon_view_views.h" 5 #include "chrome/browser/ui/views/notifications/balloon_view_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/notifications/balloon.h" 13 #include "chrome/browser/notifications/balloon.h"
14 #include "chrome/browser/notifications/balloon_collection.h" 14 #include "chrome/browser/notifications/balloon_collection.h"
15 #include "chrome/browser/notifications/desktop_notification_service.h" 15 #include "chrome/browser/notifications/desktop_notification_service.h"
16 #include "chrome/browser/notifications/notification.h" 16 #include "chrome/browser/notifications/notification.h"
17 #include "chrome/browser/notifications/notification_options_menu_model.h" 17 #include "chrome/browser/notifications/notification_options_menu_model.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "content/public/browser/notification_details.h" 19 #include "content/public/browser/notification_details.h"
20 #include "content/public/browser/notification_source.h" 20 #include "content/public/browser/notification_source.h"
21 #include "content/public/browser/notification_types.h" 21 #include "content/public/browser/notification_types.h"
22 #include "content/public/browser/render_view_host.h" 22 #include "content/public/browser/render_view_host.h"
23 #include "content/public/browser/render_widget_host_view.h" 23 #include "content/public/browser/render_widget_host_view.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
27 #include "grit/theme_resources_standard.h"
28 #include "ui/base/animation/slide_animation.h" 27 #include "ui/base/animation/slide_animation.h"
29 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 29 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/gfx/canvas.h" 30 #include "ui/gfx/canvas.h"
32 #include "ui/gfx/insets.h" 31 #include "ui/gfx/insets.h"
33 #include "ui/gfx/native_widget_types.h" 32 #include "ui/gfx/native_widget_types.h"
34 #include "ui/views/bubble/bubble_border.h" 33 #include "ui/views/bubble/bubble_border.h"
35 #include "ui/views/controls/button/button.h" 34 #include "ui/views/controls/button/button.h"
36 #include "ui/views/controls/button/image_button.h" 35 #include "ui/views/controls/button/image_button.h"
37 #include "ui/views/controls/button/text_button.h" 36 #include "ui/views/controls/button/text_button.h"
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 return; 540 return;
542 } 541 }
543 542
544 // If the renderer process attached to this balloon is disconnected 543 // If the renderer process attached to this balloon is disconnected
545 // (e.g., because of a crash), we want to close the balloon. 544 // (e.g., because of a crash), we want to close the balloon.
546 notification_registrar_.Remove( 545 notification_registrar_.Remove(
547 this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED, 546 this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
548 content::Source<Balloon>(balloon_)); 547 content::Source<Balloon>(balloon_));
549 Close(false); 548 Close(false);
550 } 549 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/zoom_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698