chrome/browser/ui/gtk/gtk_util.cc - Issue 6849030: Add support for multi resolution icons

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

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed resource ID conflict with devtools Created 9 years, 8 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

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>	8 #include <gdk/gdkx.h>

9 #include <gtk/gtk.h>	9 #include <gtk/gtk.h>

10	10

(...skipping 14 matching lines...) Expand all Loading...
25 #include "chrome/browser/ui/browser_list.h"	25 #include "chrome/browser/ui/browser_list.h"

26 #include "chrome/browser/ui/browser_window.h"	26 #include "chrome/browser/ui/browser_window.h"

27 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"	27 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"

28 #include "chrome/browser/ui/gtk/gtk_theme_service.h"	28 #include "chrome/browser/ui/gtk/gtk_theme_service.h"

29 #include "content/browser/disposition_utils.h"	29 #include "content/browser/disposition_utils.h"

30 #include "content/browser/renderer_host/render_view_host.h"	30 #include "content/browser/renderer_host/render_view_host.h"

31 #include "content/browser/tab_contents/tab_contents.h"	31 #include "content/browser/tab_contents/tab_contents.h"

32 #include "content/common/renderer_preferences.h"	32 #include "content/common/renderer_preferences.h"

33 #include "googleurl/src/gurl.h"	33 #include "googleurl/src/gurl.h"

34 #include "grit/theme_resources.h"	34 #include "grit/theme_resources.h"

	35 #include "grit/theme_resources_standard.h"

35 #include "third_party/skia/include/core/SkBitmap.h"	36 #include "third_party/skia/include/core/SkBitmap.h"

36 #include "third_party/skia/include/core/SkColor.h"	37 #include "third_party/skia/include/core/SkColor.h"

37 #include "ui/base/l10n/l10n_util.h"	38 #include "ui/base/l10n/l10n_util.h"

38 #include "ui/base/resource/resource_bundle.h"	39 #include "ui/base/resource/resource_bundle.h"

39 #include "ui/base/x/x11_util.h"	40 #include "ui/base/x/x11_util.h"

40 #include "ui/gfx/gtk_util.h"	41 #include "ui/gfx/gtk_util.h"

41	42

42 #if defined(OS_CHROMEOS)	43 #if defined(OS_CHROMEOS)

43 #include "chrome/browser/chromeos/frame/browser_view.h"	44 #include "chrome/browser/chromeos/frame/browser_view.h"

44 #include "chrome/browser/chromeos/native_dialog_window.h"	45 #include "chrome/browser/chromeos/native_dialog_window.h"

(...skipping 1202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1247	1248

1248 void DoCopy(BrowserWindow* window) {	1249 void DoCopy(BrowserWindow* window) {

1249 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");	1250 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");

1250 }	1251 }

1251	1252

1252 void DoPaste(BrowserWindow* window) {	1253 void DoPaste(BrowserWindow* window) {

1253 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");	1254 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");

1254 }	1255 }

1255	1256

1256 } // namespace gtk_util	1257 } // namespace gtk_util

OLD	NEW

« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | ui/gfx/image_mac_unittest.mm » ('J')