| Index: ios/web/public/favicon_status.h
|
| diff --git a/content/public/browser/favicon_status.h b/ios/web/public/favicon_status.h
|
| similarity index 65%
|
| copy from content/public/browser/favicon_status.h
|
| copy to ios/web/public/favicon_status.h
|
| index 7bd9328749d2b7a6ee93c748dbb95e9a9609391d..e919f833518784f807752853d2eab31e48b4e58b 100644
|
| --- a/content/public/browser/favicon_status.h
|
| +++ b/ios/web/public/favicon_status.h
|
| @@ -1,18 +1,17 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 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.
|
|
|
| -#ifndef CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_
|
| -#define CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_
|
| +#ifndef IOS_WEB_PUBLIC_FAVICON_STATUS_H_
|
| +#define IOS_WEB_PUBLIC_FAVICON_STATUS_H_
|
|
|
| -#include "content/common/content_export.h"
|
| #include "ui/gfx/image/image.h"
|
| #include "url/gurl.h"
|
|
|
| -namespace content {
|
| +namespace web {
|
|
|
| -// Collects the favicon related information for a NavigationEntry.
|
| -struct CONTENT_EXPORT FaviconStatus {
|
| +// Collects the favicon related information for a NavigationItem.
|
| +struct FaviconStatus {
|
| FaviconStatus();
|
|
|
| // Indicates whether we've gotten an official favicon for the page, or are
|
| @@ -31,6 +30,6 @@ struct CONTENT_EXPORT FaviconStatus {
|
| // Copy and assignment is explicitly allowed for this struct.
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace web
|
|
|
| -#endif // CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_
|
| +#endif // IOS_WEB_PUBLIC_FAVICON_STATUS_H_
|
|
|