chrome/browser/chromeos/login/user_controller.cc - Issue 1132006: Move app/gfx/canvas and app/gfx/font to 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/login/user_controller.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 9 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/rounded_rect_painter.cc ('k') | chrome/browser/chromeos/login/wizard_screen.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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_controller.h"	5 #include "chrome/browser/chromeos/login/user_controller.h"

6	6

7 #include "app/gfx/canvas.h"

8 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

9 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

10 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

	10 #include "gfx/canvas.h"

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

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

13 #include "third_party/skia/include/core/SkColor.h"	13 #include "third_party/skia/include/core/SkColor.h"

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

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

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

17 #include "views/controls/button/native_button.h"	17 #include "views/controls/button/native_button.h"

18 #include "views/grid_layout.h"	18 #include "views/grid_layout.h"

19 #include "views/widget/root_view.h"	19 #include "views/widget/root_view.h"

20 #include "views/widget/widget_gtk.h"	20 #include "views/widget/widget_gtk.h"

(...skipping 206 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227 int height = label->GetPreferredSize().height();	227 int height = label->GetPreferredSize().height();

228 std::vector<int> params;	228 std::vector<int> params;

229 params.push_back(index);	229 params.push_back(index);

230 WmIpc::instance()->SetWindowType(window->GetNativeView(), type, &params);	230 WmIpc::instance()->SetWindowType(window->GetNativeView(), type, &params);

231 window->SetBounds(gfx::Rect(0, 0, width, height));	231 window->SetBounds(gfx::Rect(0, 0, width, height));

232 window->Show();	232 window->Show();

233 return window;	233 return window;

234 }	234 }

235	235

236 } // namespace chromeos	236 } // namespace chromeos

OLD	NEW