| Index: components/favicon/core/favicon_url.cc
|
| diff --git a/content/public/common/favicon_url.cc b/components/favicon/core/favicon_url.cc
|
| similarity index 56%
|
| copy from content/public/common/favicon_url.cc
|
| copy to components/favicon/core/favicon_url.cc
|
| index 68ba481b531178388feef27c198073f1555dce8a..ef48d168336479e2d88e8ed62449c1adc3177f3e 100644
|
| --- a/content/public/common/favicon_url.cc
|
| +++ b/components/favicon/core/favicon_url.cc
|
| @@ -1,21 +1,21 @@
|
| -// Copyright (c) 2011 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.
|
|
|
| -#include "content/public/common/favicon_url.h"
|
| +#include "components/favicon/core/favicon_url.h"
|
|
|
| -namespace content {
|
| +namespace favicon {
|
|
|
| FaviconURL::FaviconURL()
|
| - : icon_type(INVALID_ICON) {
|
| + : icon_type(favicon_base::INVALID_ICON) {
|
| }
|
|
|
| FaviconURL::FaviconURL(const GURL& url,
|
| - IconType type,
|
| + favicon_base::IconType type,
|
| const std::vector<gfx::Size>& sizes)
|
| : icon_url(url), icon_type(type), icon_sizes(sizes) {}
|
|
|
| FaviconURL::~FaviconURL() {
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace favicon
|
|
|