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

Side by Side Diff: chrome/common/web_apps.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/common/net/net_resource_provider.cc ('k') | chrome/default_plugin/plugin_impl_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/web_apps.h" 5 #include "chrome/common/web_apps.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h"
12 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
13 #include "base/string16.h" 12 #include "base/string16.h"
14 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
15 #include "base/string_split.h" 14 #include "base/string_split.h"
16 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
17 #include "base/values.h" 16 #include "base/values.h"
18 #include "chrome/common/json_schema_validator.h" 17 #include "chrome/common/json_schema_validator.h"
19 #include "gfx/size.h" 18 #include "gfx/size.h"
20 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
21 #include "grit/common_resources.h" 20 #include "grit/common_resources.h"
22 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
29 #include "ui/base/resource/resource_bundle.h"
30 #include "webkit/glue/dom_operations.h" 30 #include "webkit/glue/dom_operations.h"
31 31
32 using WebKit::WebDocument; 32 using WebKit::WebDocument;
33 using WebKit::WebElement; 33 using WebKit::WebElement;
34 using WebKit::WebFrame; 34 using WebKit::WebFrame;
35 using WebKit::WebNode; 35 using WebKit::WebNode;
36 using WebKit::WebNodeList; 36 using WebKit::WebNodeList;
37 using WebKit::WebString; 37 using WebKit::WebString;
38 38
39 namespace { 39 namespace {
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 web_app->app_url = app_url; 319 web_app->app_url = app_url;
320 web_app->urls = urls; 320 web_app->urls = urls;
321 web_app->permissions = permissions; 321 web_app->permissions = permissions;
322 web_app->icons = icons; 322 web_app->icons = icons;
323 323
324 return true; 324 return true;
325 325
326 } 326 }
327 327
328 } // namespace web_apps 328 } // namespace web_apps
OLDNEW
« no previous file with comments | « chrome/common/net/net_resource_provider.cc ('k') | chrome/default_plugin/plugin_impl_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698