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

Unified Diff: chrome/browser/gears_integration.cc

Issue 4979003: Implement web app definition parsing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nacl64 build Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/gears_integration.cc
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index d1f13cf10dd3d7a3ce36a48ffe8ae6356be2da29..1ab162a32ba018023250ddc91e8fde19393a5657 100644
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -15,10 +15,10 @@
#include "chrome/browser/chrome_plugin_host.h"
#include "chrome/common/chrome_plugin_util.h"
#include "chrome/common/gears_api.h"
+#include "chrome/common/web_apps.h"
#include "gfx/codec/png_codec.h"
#include "googleurl/src/gurl.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/glue/dom_operations.h"
// The following 2 helpers are borrowed from the Gears codebase.
@@ -139,7 +139,7 @@ class CreateShortcutCommand : public CPCommandInterface {
CreateShortcutCommand(
const std::string& name, const std::string& orig_name,
const std::string& url, const std::string& description,
- const std::vector<webkit_glue::WebApplicationInfo::IconInfo> &icons,
+ const std::vector<WebApplicationInfo::IconInfo> &icons,
const SkBitmap& fallback_icon,
GearsCreateShortcutCallback* callback)
: name_(name), url_(url), description_(description),
@@ -157,7 +157,7 @@ class CreateShortcutCommand : public CPCommandInterface {
bool has_icon = false;
for (size_t i = 0; i < icons.size(); ++i) {
- const webkit_glue::WebApplicationInfo::IconInfo& icon = icons[i];
+ const WebApplicationInfo::IconInfo& icon = icons[i];
if (icon.width == 16 && icon.height == 16) {
has_icon = true;
InitIcon(SIZE_16x16, icon.url, 16, 16);
@@ -232,7 +232,7 @@ class CreateShortcutCommand : public CPCommandInterface {
DISABLE_RUNNABLE_METHOD_REFCOUNT(CreateShortcutCommand);
void GearsCreateShortcut(
- const webkit_glue::WebApplicationInfo& app_info,
+ const WebApplicationInfo& app_info,
const string16& fallback_name,
const GURL& fallback_url,
const SkBitmap& fallback_icon,

Powered by Google App Engine
This is Rietveld 408576698