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 23 matching lines...) Expand all Loading... |
45 #include "ui/gfx/gtk_util.h" | 44 #include "ui/gfx/gtk_util.h" |
46 #include "ui/gfx/image/image.h" | 45 #include "ui/gfx/image/image.h" |
47 | 46 |
48 #if defined(OS_CHROMEOS) | 47 #if defined(OS_CHROMEOS) |
49 #include "chrome/browser/chromeos/frame/browser_view.h" | 48 #include "chrome/browser/chromeos/frame/browser_view.h" |
50 #include "chrome/browser/chromeos/native_dialog_window.h" | 49 #include "chrome/browser/chromeos/native_dialog_window.h" |
51 #else | 50 #else |
52 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 51 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
53 #endif | 52 #endif |
54 | 53 |
| 54 // These conflict with base/tracked_objects.h, so need to come last. |
| 55 #include <gdk/gdkx.h> |
| 56 #include <gtk/gtk.h> |
| 57 |
55 namespace { | 58 namespace { |
56 | 59 |
57 #if defined(GOOGLE_CHROME_BUILD) | 60 #if defined(GOOGLE_CHROME_BUILD) |
58 static const char* kIconName = "google-chrome"; | 61 static const char* kIconName = "google-chrome"; |
59 #else | 62 #else |
60 static const char* kIconName = "chromium-browser"; | 63 static const char* kIconName = "chromium-browser"; |
61 #endif | 64 #endif |
62 | 65 |
63 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>"; | 66 const char kBoldLabelMarkup[] = "<span weight='bold'>%s</span>"; |
64 | 67 |
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1201 | 1204 |
1202 void DoCopy(BrowserWindow* window) { | 1205 void DoCopy(BrowserWindow* window) { |
1203 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); | 1206 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); |
1204 } | 1207 } |
1205 | 1208 |
1206 void DoPaste(BrowserWindow* window) { | 1209 void DoPaste(BrowserWindow* window) { |
1207 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); | 1210 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); |
1208 } | 1211 } |
1209 | 1212 |
1210 } // namespace gtk_util | 1213 } // namespace gtk_util |
OLD | NEW |