Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Side by Side Diff: chrome/browser/chromeos/login/user_image_view.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
OLDNEW
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_image_view.h" 5 #include "chrome/browser/chromeos/login/user_image_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/chromeos/login/helper.h" 11 #include "chrome/browser/chromeos/login/helper.h"
12 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 12 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
13 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" 13 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "gfx/canvas.h"
16 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
17 #include "grit/theme_resources.h" 16 #include "grit/theme_resources.h"
18 #include "skia/ext/image_operations.h" 17 #include "skia/ext/image_operations.h"
19 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/gfx/canvas.h"
21 #include "views/controls/button/image_button.h" 21 #include "views/controls/button/image_button.h"
22 #include "views/controls/button/native_button.h" 22 #include "views/controls/button/native_button.h"
23 #include "views/controls/image_view.h" 23 #include "views/controls/image_view.h"
24 #include "views/controls/label.h" 24 #include "views/controls/label.h"
25 #include "views/controls/throbber.h" 25 #include "views/controls/throbber.h"
26 #include "views/layout/grid_layout.h" 26 #include "views/layout/grid_layout.h"
27 27
28 namespace { 28 namespace {
29 29
30 // Margin in pixels from the left and right borders of screen's contents. 30 // Margin in pixels from the left and right borders of screen's contents.
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 delegate_->OnOK(user_image_->GetImage()); 325 delegate_->OnOK(user_image_->GetImage());
326 } else if (sender == skip_button_) { 326 } else if (sender == skip_button_) {
327 delegate_->OnSkip(); 327 delegate_->OnSkip();
328 } else { 328 } else {
329 NOTREACHED(); 329 NOTREACHED();
330 } 330 }
331 } 331 }
332 332
333 } // namespace chromeos 333 } // namespace chromeos
334 334
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_image_loader.cc ('k') | chrome/browser/chromeos/login/user_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698