| Index: chrome/common/web_apps.cc
|
| diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc
|
| index bfcf19945203486cfb8604ba673b4f3ec06576b9..15647543c07bf35dcf9da4f76a7da93914da3ee8 100644
|
| --- a/chrome/common/web_apps.cc
|
| +++ b/chrome/common/web_apps.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -25,6 +25,7 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| +#include "ui/base/layout.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/size.h"
|
| #include "webkit/glue/dom_operations.h"
|
| @@ -216,7 +217,8 @@ bool ParseWebAppFromDefinitionFile(Value* definition_value,
|
| scoped_ptr<Value> schema(
|
| base::JSONReader::ReadAndReturnError(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - IDR_WEB_APP_SCHEMA).as_string(),
|
| + IDR_WEB_APP_SCHEMA,
|
| + ui::SCALE_FACTOR_NONE).as_string(),
|
| base::JSON_PARSE_RFC, // options
|
| &error_code,
|
| &error_message));
|
|
|