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

Side by Side Diff: chrome/browser/extensions/convert_web_app.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/extensions/convert_web_app.h" 5 #include "chrome/browser/extensions/convert_web_app.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/base64.h" 12 #include "base/base64.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/scoped_temp_dir.h" 17 #include "base/scoped_temp_dir.h"
18 #include "base/sha2.h" 18 #include "base/sha2.h"
19 #include "base/stringprintf.h" 19 #include "base/stringprintf.h"
20 #include "base/time.h" 20 #include "base/time.h"
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
24 #include "chrome/common/extensions/extension_constants.h" 24 #include "chrome/common/extensions/extension_constants.h"
25 #include "chrome/common/extensions/extension_file_util.h" 25 #include "chrome/common/extensions/extension_file_util.h"
26 #include "chrome/common/json_value_serializer.h" 26 #include "chrome/common/json_value_serializer.h"
27 #include "chrome/common/web_apps.h" 27 #include "chrome/common/web_apps.h"
28 #include "gfx/codec/png_codec.h"
29 #include "googleurl/src/gurl.h" 28 #include "googleurl/src/gurl.h"
30 #include "third_party/skia/include/core/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "ui/gfx/codec/png_codec.h"
31 31
32 namespace keys = extension_manifest_keys; 32 namespace keys = extension_manifest_keys;
33 33
34 using base::Time; 34 using base::Time;
35 35
36 namespace { 36 namespace {
37 37
38 const char kIconsDirName[] = "icons"; 38 const char kIconsDirName[] = "icons";
39 39
40 // Create the public key for the converted web app. 40 // Create the public key for the converted web app.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 scoped_refptr<Extension> extension = Extension::Create( 170 scoped_refptr<Extension> extension = Extension::Create(
171 temp_dir.path(), Extension::INTERNAL, *root, false, &error); 171 temp_dir.path(), Extension::INTERNAL, *root, false, &error);
172 if (!extension) { 172 if (!extension) {
173 LOG(ERROR) << error; 173 LOG(ERROR) << error;
174 return NULL; 174 return NULL;
175 } 175 }
176 176
177 temp_dir.Take(); // The caller takes ownership of the directory. 177 temp_dir.Take(); // The caller takes ownership of the directory.
178 return extension; 178 return extension;
179 } 179 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/browser_action_test_util_views.cc ('k') | chrome/browser/extensions/convert_web_app_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698