chrome/browser/chromeos/panels/panel_scroller_header.cc - Issue 6134010: Revert 71167 - Remove wstring from gfx....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/chromeos/panels/panel_scroller_header.cc

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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

« no previous file with comments | « chrome/browser/chromeos/login/username_view.cc ('k') | chrome/browser/gtk/bookmark_utils_gtk.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this

2 // Use of this source code is governed by a BSD-style license that can be	2 // source code is governed by a BSD-style license that can be found in the

3 // found in the LICENSE file.	3 // LICENSE file.

4	4

5 #include "chrome/browser/chromeos/panels/panel_scroller_header.h"	5 #include "chrome/browser/chromeos/panels/panel_scroller_header.h"

6	6

7 #include "app/resource_bundle.h"	7 #include "app/resource_bundle.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/chromeos/panels/panel_scroller.h"	9 #include "chrome/browser/chromeos/panels/panel_scroller.h"

10 #include "gfx/canvas.h"	10 #include "gfx/canvas.h"

11 #include "gfx/font.h"	11 #include "gfx/font.h"

12	12

13 PanelScrollerHeader::PanelScrollerHeader(PanelScroller* scroller)	13 PanelScrollerHeader::PanelScrollerHeader(PanelScroller* scroller)

(...skipping 24 matching lines...) Expand all Loading...
38 void PanelScrollerHeader::Paint(gfx::Canvas* canvas) {	38 void PanelScrollerHeader::Paint(gfx::Canvas* canvas) {

39 // TODO(brettw) fill this out with real styling.	39 // TODO(brettw) fill this out with real styling.

40 canvas->FillRectInt(0xFFFFFFFF, 0, 0, size().width(), size().height());	40 canvas->FillRectInt(0xFFFFFFFF, 0, 0, size().width(), size().height());

41 canvas->DrawLineInt(0xFFE6E6E6, 0, size().height() - 1,	41 canvas->DrawLineInt(0xFFE6E6E6, 0, size().height() - 1,

42 size().width(), size().height() - 1);	42 size().width(), size().height() - 1);

43	43

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

45 gfx::Font font =	45 gfx::Font font =

46 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);	46 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);

47 int font_top = 1;	47 int font_top = 1;

48 canvas->DrawStringInt(title_, font, 0xFF000000, 3, font_top,	48 canvas->DrawStringInt(UTF16ToWideHack(title_), font, 0xFF000000, 3, font_top,

49 size().width(), size().height() - font_top);	49 size().width(), size().height() - font_top);

50 }	50 }

OLD	NEW