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

Side by Side Diff: chrome/browser/views/create_application_shortcut_view.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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/views/create_application_shortcut_view.h" 5 #include "chrome/browser/views/create_application_shortcut_view.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/callback.h" 9 #include "base/callback.h"
11 #include "chrome/browser/pref_service.h" 10 #include "chrome/browser/pref_service.h"
12 #include "chrome/browser/profile.h" 11 #include "chrome/browser/profile.h"
13 #include "chrome/browser/tab_contents/tab_contents.h" 12 #include "chrome/browser/tab_contents/tab_contents.h"
14 #include "chrome/browser/tab_contents/tab_contents_delegate.h" 13 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
15 #include "chrome/common/chrome_constants.h" 14 #include "chrome/common/chrome_constants.h"
16 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "gfx/canvas.h"
17 #include "gfx/codec/png_codec.h" 17 #include "gfx/codec/png_codec.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "grit/locale_settings.h" 19 #include "grit/locale_settings.h"
20 #include "net/base/load_flags.h" 20 #include "net/base/load_flags.h"
21 #include "net/url_request/url_request.h" 21 #include "net/url_request/url_request.h"
22 #include "third_party/skia/include/core/SkRect.h" 22 #include "third_party/skia/include/core/SkRect.h"
23 #include "third_party/skia/include/core/SkPaint.h" 23 #include "third_party/skia/include/core/SkPaint.h"
24 #include "views/controls/button/checkbox.h" 24 #include "views/controls/button/checkbox.h"
25 #include "views/controls/image_view.h" 25 #include "views/controls/image_view.h"
26 #include "views/controls/label.h" 26 #include "views/controls/label.h"
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 const SkBitmap& image) { 447 const SkBitmap& image) {
448 pending_download_ = NULL; 448 pending_download_ = NULL;
449 449
450 if (!errored && !image.isNull()) { 450 if (!errored && !image.isNull()) {
451 shortcut_info_.favicon = image; 451 shortcut_info_.favicon = image;
452 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon); 452 static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
453 } else { 453 } else {
454 FetchIcon(); 454 FetchIcon();
455 } 455 }
456 } 456 }
OLDNEW
« no previous file with comments | « chrome/browser/views/cookie_prompt_view.cc ('k') | chrome/browser/views/detachable_toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698