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

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

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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "app/l10n_util.h" 14 #include "app/l10n_util.h"
15 #include "app/resource_bundle.h"
16 #include "base/auto_reset.h" 15 #include "base/auto_reset.h"
17 #include "base/command_line.h" 16 #include "base/command_line.h"
18 #include "base/logging.h" 17 #include "base/logging.h"
19 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
20 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/defaults.h" 20 #include "chrome/browser/defaults.h"
22 #include "chrome/browser/memory_purger.h" 21 #include "chrome/browser/memory_purger.h"
23 #include "chrome/browser/prefs/pref_service.h" 22 #include "chrome/browser/prefs/pref_service.h"
24 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" 23 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
25 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 24 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
26 #include "chrome/browser/ui/gtk/gtk_tree.h" 25 #include "chrome/browser/ui/gtk/gtk_tree.h"
27 #include "chrome/browser/ui/gtk/gtk_util.h" 26 #include "chrome/browser/ui/gtk/gtk_util.h"
28 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
30 #include "gfx/gtk_util.h" 29 #include "gfx/gtk_util.h"
31 #include "grit/app_resources.h" 30 #include "grit/app_resources.h"
32 #include "grit/chromium_strings.h" 31 #include "grit/chromium_strings.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 32 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "ui/base/models/simple_menu_model.h" 33 #include "ui/base/models/simple_menu_model.h"
34 #include "ui/base/resource/resource_bundle.h"
35 35
36 #if defined(TOOLKIT_VIEWS) 36 #if defined(TOOLKIT_VIEWS)
37 #include "views/controls/menu/menu_2.h" 37 #include "views/controls/menu/menu_2.h"
38 #else 38 #else
39 #include "chrome/browser/ui/gtk/menu_gtk.h" 39 #include "chrome/browser/ui/gtk/menu_gtk.h"
40 #endif 40 #endif
41 41
42 namespace { 42 namespace {
43 43
44 // The task manager window default size. 44 // The task manager window default size.
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 guint keyval, 950 guint keyval,
951 GdkModifierType modifier) { 951 GdkModifierType modifier) {
952 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) { 952 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) {
953 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget 953 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget
954 // is destroyed. The deleted object will receive gtk signals otherwise. 954 // is destroyed. The deleted object will receive gtk signals otherwise.
955 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT); 955 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT);
956 } 956 }
957 957
958 return TRUE; 958 return TRUE;
959 } 959 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698