chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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

« no previous file with comments | « chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h ('k') | chrome/browser/ui/views/constrained_window_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

index 5fa52f759788a6a856e1f4671dd69b32074a9d49..086d2ebf69cc2e3ccab851d199ec567b597478d0 100644

--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

@@ -16,8 +16,8 @@

#include "grit/theme_resources.h"

#include "grit/theme_resources_standard.h"

#include "grit/ui_resources.h"

-#include "ui/aura/window.h"

#include "ui/aura/client/aura_constants.h"

+#include "ui/aura/window.h"

#include "ui/base/accessibility/accessible_view_state.h"

#include "ui/base/hit_test.h"

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

@@ -341,7 +341,7 @@ bool BrowserNonClientFrameViewAsh::ShouldTabIconViewAnimate() const {

return current_tab ? current_tab->IsLoading() : false;

}

-SkBitmap BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {

+gfx::ImageSkia BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {

views::WidgetDelegate* delegate = frame()->widget_delegate();

if (!delegate)

return SkBitmap();