chrome/browser/chromeos/login/user_view.cc - Issue 6901058: Increase infobar height and infobar button height for touch.

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/login/user_view.cc

Issue 6901058: Increase infobar height and infobar button height for touch. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Undo inadvertant merge changes (hopefully). Created 9 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/message_bubble.cc ('k') | chrome/browser/download/download_request_infobar_delegate.cc » ('j') | no next file with comments »

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/chromeos/login/user_view.h"	5 #include "chrome/browser/chromeos/login/user_view.h"

6	6

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

8 #include "chrome/browser/chromeos/login/helper.h"	8 #include "chrome/browser/chromeos/login/helper.h"

9 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"	9 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"

10 #include "chrome/browser/chromeos/login/rounded_view.h"	10 #include "chrome/browser/chromeos/login/rounded_view.h"

11 #include "chrome/browser/chromeos/view_ids.h"	11 #include "chrome/browser/chromeos/view_ids.h"

12 #include "grit/generated_resources.h"	12 #include "grit/generated_resources.h"

13 #include "grit/theme_resources.h"	13 #include "grit/theme_resources_standard.h"

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

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

16 #include "ui/gfx/canvas.h"	16 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/canvas_skia.h"	17 #include "ui/gfx/canvas_skia.h"

18 #include "ui/gfx/gtk_util.h"	18 #include "ui/gfx/gtk_util.h"

19 #include "ui/gfx/rect.h"	19 #include "ui/gfx/rect.h"

20 #include "views/background.h"	20 #include "views/background.h"

21 #include "views/controls/button/text_button.h"	21 #include "views/controls/button/text_button.h"

22 #include "views/controls/image_view.h"	22 #include "views/controls/image_view.h"

23 #include "views/controls/label.h"	23 #include "views/controls/label.h"

(...skipping 314 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
338 delegate_->OnRemoveUser();	338 delegate_->OnRemoveUser();

339 }	339 }

340	340

341 void UserView::OnLocaleChanged() {	341 void UserView::OnLocaleChanged() {

342 remove_button_->SetText(	342 remove_button_->SetText(

343 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));	343 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));

344 delegate_->OnLocaleChanged();	344 delegate_->OnLocaleChanged();

345 }	345 }

346	346

347 } // namespace chromeos	347 } // namespace chromeos

OLD	NEW