ui/oak/oak_window.cc - Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/oak/oak_window.cc

Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: ui/oak/oak_window.cc

diff --git a/ui/oak/oak_window.cc b/ui/oak/oak_window.cc

index 52663365da76598c898932f22c658ea4658e2e3f..7bcf20293a870ec0a6cfe20884aec1553eadba99 100644

--- a/ui/oak/oak_window.cc

+++ b/ui/oak/oak_window.cc

@@ -4,13 +4,13 @@

#include "ui/oak/oak_window.h"

-#include "ui/oak/oak.h"

#include "base/utf_string_conversions.h"

#include "grit/ui_resources.h"

#include "ui/aura/root_window.h"

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/image.h"

+#include "ui/oak/oak.h"

#include "ui/oak/oak_aura_window_display.h"

#include "ui/views/controls/table/table_view.h"

#include "ui/views/controls/tree/tree_view.h"

@@ -57,9 +57,9 @@ views::View* OakWindow::GetContentsView() {

return this;

}

-SkBitmap OakWindow::GetWindowIcon() {

+gfx::ImageSkia OakWindow::GetWindowIcon() {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

- return *rb.GetImageNamed(IDR_OAK).ToSkBitmap();

+ return *rb.GetImageNamed(IDR_OAK).ToImageSkia();

}

bool OakWindow::ShouldShowWindowIcon() const {

« no previous file with comments | « ui/oak/oak_window.h ('k') | ui/views/bubble/bubble_border.h » ('j') | no next file with comments »