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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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/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 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <cstdarg> 10 #include <cstdarg>
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
27 #include "chrome/browser/ui/browser_list.h" 27 #include "chrome/browser/ui/browser_list.h"
28 #include "chrome/browser/ui/browser_tabstrip.h" 28 #include "chrome/browser/ui/browser_tabstrip.h"
29 #include "chrome/browser/ui/browser_window.h" 29 #include "chrome/browser/ui/browser_window.h"
30 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 30 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
31 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 31 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
32 #include "content/public/browser/render_view_host.h" 32 #include "content/public/browser/render_view_host.h"
33 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
34 #include "googleurl/src/gurl.h" 34 #include "googleurl/src/gurl.h"
35 #include "grit/theme_resources.h" 35 #include "grit/theme_resources.h"
36 #include "grit/theme_resources_standard.h"
37 #include "ui/base/gtk/gtk_compat.h" 36 #include "ui/base/gtk/gtk_compat.h"
38 #include "ui/base/gtk/gtk_hig_constants.h" 37 #include "ui/base/gtk/gtk_hig_constants.h"
39 #include "ui/base/gtk/gtk_screen_util.h" 38 #include "ui/base/gtk/gtk_screen_util.h"
40 #include "ui/base/gtk/menu_label_accelerator_util.h" 39 #include "ui/base/gtk/menu_label_accelerator_util.h"
41 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
42 #include "ui/base/resource/resource_bundle.h" 41 #include "ui/base/resource/resource_bundle.h"
43 #include "ui/base/text/text_elider.h" 42 #include "ui/base/text/text_elider.h"
44 #include "ui/base/x/x11_util.h" 43 #include "ui/base/x/x11_util.h"
45 #include "ui/gfx/image/cairo_cached_surface.h" 44 #include "ui/gfx/image/cairo_cached_surface.h"
46 #include "ui/gfx/image/image.h" 45 #include "ui/gfx/image/image.h"
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 1036
1038 void DoCopy(BrowserWindow* window) { 1037 void DoCopy(BrowserWindow* window) {
1039 DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard"); 1038 DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard");
1040 } 1039 }
1041 1040
1042 void DoPaste(BrowserWindow* window) { 1041 void DoPaste(BrowserWindow* window) {
1043 DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard"); 1042 DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard");
1044 } 1043 }
1045 1044
1046 } // namespace gtk_util 1045 } // namespace gtk_util
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698