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

Side by Side Diff: chrome/browser/ui/gtk/notifications/balloon_view_gtk.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/gtk/notifications/balloon_view_gtk.h" 5 #include "chrome/browser/ui/gtk/notifications/balloon_view_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h" 30 #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h"
31 #include "chrome/browser/ui/gtk/rounded_window.h" 31 #include "chrome/browser/ui/gtk/rounded_window.h"
32 #include "chrome/common/chrome_notification_types.h" 32 #include "chrome/common/chrome_notification_types.h"
33 #include "chrome/common/extensions/extension.h" 33 #include "chrome/common/extensions/extension.h"
34 #include "content/public/browser/notification_source.h" 34 #include "content/public/browser/notification_source.h"
35 #include "content/public/browser/render_view_host.h" 35 #include "content/public/browser/render_view_host.h"
36 #include "content/public/browser/render_widget_host_view.h" 36 #include "content/public/browser/render_widget_host_view.h"
37 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
38 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
39 #include "grit/theme_resources.h" 39 #include "grit/theme_resources.h"
40 #include "grit/theme_resources_standard.h"
41 #include "ui/base/animation/slide_animation.h" 40 #include "ui/base/animation/slide_animation.h"
42 #include "ui/base/gtk/gtk_hig_constants.h" 41 #include "ui/base/gtk/gtk_hig_constants.h"
43 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
44 #include "ui/base/resource/resource_bundle.h" 43 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/gfx/canvas.h" 44 #include "ui/gfx/canvas.h"
46 #include "ui/gfx/insets.h" 45 #include "ui/gfx/insets.h"
47 #include "ui/gfx/native_widget_types.h" 46 #include "ui/gfx/native_widget_types.h"
48 47
49 namespace { 48 namespace {
50 49
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 weak_factory_.GetWeakPtr(), 481 weak_factory_.GetWeakPtr(),
483 false)); 482 false));
484 } 483 }
485 } 484 }
486 485
487 gboolean BalloonViewImpl::OnDestroy(GtkWidget* widget) { 486 gboolean BalloonViewImpl::OnDestroy(GtkWidget* widget) {
488 frame_container_ = NULL; 487 frame_container_ = NULL;
489 Close(false); 488 Close(false);
490 return FALSE; // Propagate. 489 return FALSE; // Propagate.
491 } 490 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698