chrome/browser/ui/views/frame/browser_view.h - 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: chrome/browser/ui/views/frame/browser_view.h

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: Sorted headers in modified files 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

« ash/shell/content_client/shell_content_browser_client.cc ('K') | « chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.h

diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h

index 27c974ad0604f91095693517aa2a20b5db6de844..36992a5aecb17d570b0521fb55cdb07645e560fc 100644

--- a/chrome/browser/ui/views/frame/browser_view.h

+++ b/chrome/browser/ui/views/frame/browser_view.h

@@ -181,7 +181,7 @@ class BrowserView : public BrowserWindow,

TabContentsWrapper* GetSelectedTabContentsWrapper() const;

// Retrieves the icon to use in the frame to indicate an OTR window.

- SkBitmap GetOTRAvatarIcon() const;

+ gfx::ImageSkia GetOTRAvatarIcon() const;

// Returns true if the Browser object associated with this BrowserView is a

// tabbed-type window (i.e. a browser window, not an app or popup).

@@ -351,8 +351,8 @@ class BrowserView : public BrowserWindow,

virtual string16 GetAccessibleWindowTitle() const OVERRIDE;

virtual views::View* GetInitiallyFocusedView() OVERRIDE;

virtual bool ShouldShowWindowTitle() const OVERRIDE;

- virtual SkBitmap GetWindowAppIcon() OVERRIDE;

- virtual SkBitmap GetWindowIcon() OVERRIDE;

+ virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;

+ virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;

virtual bool ShouldShowWindowIcon() const OVERRIDE;

virtual bool ExecuteWindowsCommand(int command_id) OVERRIDE;

virtual std::string GetWindowName() const OVERRIDE;