OLD | NEW |
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/gtk_util.h" | 5 #include "chrome/browser/ui/gtk/gtk_util.h" |
6 | 6 |
7 #include <cairo/cairo.h> | 7 #include <cairo/cairo.h> |
8 #include <gdk/gdkx.h> | |
9 #include <gtk/gtk.h> | |
10 | 8 |
11 #include <cstdarg> | 9 #include <cstdarg> |
| 10 |
12 #include <map> | 11 #include <map> |
13 | 12 |
14 #include "base/environment.h" | 13 #include "base/environment.h" |
15 #include "base/i18n/rtl.h" | 14 #include "base/i18n/rtl.h" |
16 #include "base/linux_util.h" | 15 #include "base/linux_util.h" |
17 #include "base/logging.h" | 16 #include "base/logging.h" |
18 #include "base/nix/xdg_util.h" | 17 #include "base/nix/xdg_util.h" |
19 #include "base/string_number_conversions.h" | 18 #include "base/string_number_conversions.h" |
20 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
21 #include "chrome/browser/autocomplete/autocomplete.h" | 20 #include "chrome/browser/autocomplete/autocomplete.h" |
(...skipping 24 matching lines...) Expand all Loading... |
46 #include "ui/gfx/gtk_util.h" | 45 #include "ui/gfx/gtk_util.h" |
47 #include "ui/gfx/image/image.h" | 46 #include "ui/gfx/image/image.h" |
48 | 47 |
49 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
50 #include "chrome/browser/chromeos/frame/browser_view.h" | 49 #include "chrome/browser/chromeos/frame/browser_view.h" |
51 #include "chrome/browser/chromeos/native_dialog_window.h" | 50 #include "chrome/browser/chromeos/native_dialog_window.h" |
52 #else | 51 #else |
53 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 52 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
54 #endif | 53 #endif |
55 | 54 |
| 55 // These conflict with base/tracked_objects.h, so need to come last. |
| 56 #include <gdk/gdkx.h> |
| 57 #include <gtk/gtk.h> |
| 58 |
56 namespace { | 59 namespace { |
57 | 60 |
58 #if defined(GOOGLE_CHROME_BUILD) | 61 #if defined(GOOGLE_CHROME_BUILD) |
59 static const char* kIconName = "google-chrome"; | 62 static const char* kIconName = "google-chrome"; |
60 #else | 63 #else |
61 static const char* kIconName = "chromium-browser"; | 64 static const char* kIconName = "chromium-browser"; |
62 #endif | 65 #endif |
63 | 66 |
64 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>"; | 67 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>"; |
65 | 68 |
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1202 | 1205 |
1203 void DoCopy(BrowserWindow* window) { | 1206 void DoCopy(BrowserWindow* window) { |
1204 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); | 1207 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); |
1205 } | 1208 } |
1206 | 1209 |
1207 void DoPaste(BrowserWindow* window) { | 1210 void DoPaste(BrowserWindow* window) { |
1208 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); | 1211 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); |
1209 } | 1212 } |
1210 | 1213 |
1211 } // namespace gtk_util | 1214 } // namespace gtk_util |
OLD | NEW |