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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
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/gtk/task_manager_gtk.h" 5 #include "chrome/browser/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/menus/simple_menu_model.h" 15 #include "app/menus/simple_menu_model.h"
16 #include "app/resource_bundle.h" 16 #include "app/resource_bundle.h"
17 #include "base/auto_reset.h" 17 #include "base/auto_reset.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/gtk/gtk_chrome_link_button.h" 22 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
23 #include "chrome/browser/gtk/gtk_theme_provider.h" 23 #include "chrome/browser/gtk/gtk_theme_provider.h"
24 #include "chrome/browser/gtk/gtk_tree.h" 24 #include "chrome/browser/gtk/gtk_tree.h"
25 #include "chrome/browser/gtk/gtk_util.h" 25 #include "chrome/browser/gtk/gtk_util.h"
26 #include "chrome/browser/memory_purger.h" 26 #include "chrome/browser/memory_purger.h"
27 #include "chrome/browser/pref_service.h" 27 #include "chrome/browser/prefs/pref_service.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "gfx/gtk_util.h" 30 #include "gfx/gtk_util.h"
31 #include "grit/app_resources.h" 31 #include "grit/app_resources.h"
32 #include "grit/chromium_strings.h" 32 #include "grit/chromium_strings.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 33 #include "third_party/skia/include/core/SkBitmap.h"
34 34
35 #if defined(TOOLKIT_VIEWS) 35 #if defined(TOOLKIT_VIEWS)
36 #include "views/controls/menu/menu_2.h" 36 #include "views/controls/menu/menu_2.h"
37 #else 37 #else
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 guint keyval, 938 guint keyval,
939 GdkModifierType modifier) { 939 GdkModifierType modifier) {
940 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) { 940 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) {
941 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget 941 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget
942 // is destroyed. The deleted object will receive gtk signals otherwise. 942 // is destroyed. The deleted object will receive gtk signals otherwise.
943 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT); 943 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT);
944 } 944 }
945 945
946 return TRUE; 946 return TRUE;
947 } 947 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698