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

Side by Side Diff: chrome/browser/ui/gtk/task_manager_gtk.cc

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deps Created 8 years, 6 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/task_manager_gtk.h" 5 #include "chrome/browser/ui/gtk/task_manager_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/prefs/scoped_user_pref_update.h" 22 #include "chrome/browser/prefs/scoped_user_pref_update.h"
23 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" 23 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
24 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 24 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
25 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 25 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
26 #include "chrome/browser/ui/gtk/gtk_tree.h" 26 #include "chrome/browser/ui/gtk/gtk_tree.h"
27 #include "chrome/browser/ui/gtk/gtk_util.h" 27 #include "chrome/browser/ui/gtk/gtk_util.h"
28 #include "chrome/browser/ui/gtk/menu_gtk.h" 28 #include "chrome/browser/ui/gtk/menu_gtk.h"
29 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "grit/chromium_strings.h" 31 #include "grit/chromium_strings.h"
32 #include "grit/ui_resources.h" 32 #include "grit/ui_resources_standard.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 33 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "ui/base/gtk/gtk_hig_constants.h" 34 #include "ui/base/gtk/gtk_hig_constants.h"
35 #include "ui/base/gtk/menu_label_accelerator_util.h" 35 #include "ui/base/gtk/menu_label_accelerator_util.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/models/simple_menu_model.h" 37 #include "ui/base/models/simple_menu_model.h"
38 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
39 #include "ui/gfx/gtk_util.h" 39 #include "ui/gfx/gtk_util.h"
40 #include "ui/gfx/image/image.h" 40 #include "ui/gfx/image/image.h"
41 41
42 namespace { 42 namespace {
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 guint keyval, 1016 guint keyval,
1017 GdkModifierType modifier) { 1017 GdkModifierType modifier) {
1018 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) { 1018 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) {
1019 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget 1019 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget
1020 // is destroyed. The deleted object will receive gtk signals otherwise. 1020 // is destroyed. The deleted object will receive gtk signals otherwise.
1021 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT); 1021 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT);
1022 } 1022 }
1023 1023
1024 return TRUE; 1024 return TRUE;
1025 } 1025 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/intents/web_intent_picker_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698