diff options
author | jif@chromium.org <jif@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 17:23:28 +0000 |
---|---|---|
committer | jif@chromium.org <jif@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 17:23:28 +0000 |
commit | bb6145c6a501b426f31fe320ccfb78590a2cc2e1 (patch) | |
tree | 0360526f8a99ebe0bb8351fcbc3a6869de64cb51 | |
parent | cc7ec69533488692dc10fbefee96608805dcf796 (diff) | |
download | chromium_src-bb6145c6a501b426f31fe320ccfb78590a2cc2e1.zip chromium_src-bb6145c6a501b426f31fe320ccfb78590a2cc2e1.tar.gz chromium_src-bb6145c6a501b426f31fe320ccfb78590a2cc2e1.tar.bz2 |
Moved favicon_handler_delegate.h to a new component directory.
BUG=359084
Review URL: https://codereview.chromium.org/226183003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262443 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/favicon/DEPS | 3 | ||||
-rw-r--r-- | chrome/browser/favicon/OWNERS | 1 | ||||
-rw-r--r-- | chrome/browser/favicon/favicon_tab_helper.h | 2 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
-rw-r--r-- | components/OWNERS | 3 | ||||
-rw-r--r-- | components/components.gyp | 1 | ||||
-rw-r--r-- | components/favicon.gypi | 15 | ||||
-rw-r--r-- | components/favicon/DEPS | 2 | ||||
-rw-r--r-- | components/favicon/OWNERS | 2 | ||||
-rw-r--r-- | components/favicon/README | 9 | ||||
-rw-r--r-- | components/favicon/core/favicon_handler_delegate.h (renamed from chrome/browser/favicon/favicon_handler_delegate.h) | 10 |
11 files changed, 43 insertions, 7 deletions
diff --git a/chrome/browser/favicon/DEPS b/chrome/browser/favicon/DEPS index 240a794..b2d7a82 100644 --- a/chrome/browser/favicon/DEPS +++ b/chrome/browser/favicon/DEPS @@ -1,4 +1,4 @@ -include_rules = [ +include_rules = [ # Favicon is being made into a Browser Component, so we have these # three basic rules followed by temporary exceptions. Please don't # add to the list of exceptions! @@ -10,6 +10,7 @@ # Permanently-allowed DEPS beyond the standard Browser # Components-like DEPS above go here. "+chrome/browser/search/search.h", + "+components/favicon/core", "+third_party/skia/include/core/SkBitmap.h", # TODO(caitkp): Bring this list to zero. diff --git a/chrome/browser/favicon/OWNERS b/chrome/browser/favicon/OWNERS index 7da8185..e6d1c95 100644 --- a/chrome/browser/favicon/OWNERS +++ b/chrome/browser/favicon/OWNERS @@ -1,3 +1,4 @@ +sky@chromium.org stevenjb@chromium.org # Temporary owner, for refactoring changes only. diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h index d2ff0e7..64ce9a2 100644 --- a/chrome/browser/favicon/favicon_tab_helper.h +++ b/chrome/browser/favicon/favicon_tab_helper.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "chrome/browser/favicon/favicon_handler_delegate.h" +#include "components/favicon/core/favicon_handler_delegate.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" #include "content/public/common/favicon_url.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index e753ad2..e4cce4a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -30,6 +30,7 @@ '../components/components.gyp:autofill_core_browser', '../components/components.gyp:cloud_devices', '../components/components.gyp:domain_reliability', + '../components/components.gyp:favicon_core', '../components/components.gyp:navigation_metrics', '../components/components.gyp:os_crypt', '../components/components.gyp:password_manager_core_browser', @@ -655,7 +656,6 @@ 'browser/favicon/favicon_changed_details.h', 'browser/favicon/favicon_handler.cc', 'browser/favicon/favicon_handler.h', - 'browser/favicon/favicon_handler_delegate.h', 'browser/favicon/favicon_service.cc', 'browser/favicon/favicon_service.h', 'browser/favicon/favicon_service_factory.cc', diff --git a/components/OWNERS b/components/OWNERS index 3434a73..589508e 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -22,6 +22,9 @@ per-file domain_reliability.gypi=mmenke@chromium.org per-file domain_reliability.gypi=szym@chromium.org per-file domain_reliability.gypi=ttuttle@chromium.org +per-file favicon*=sky@chromium.org +per-file favicon*=stevenjb@chromium.org + per-file json_schema.gypi=asargent@chromium.org per-file json_schema.gypi=calamity@chromium.org per-file json_schema.gypi=kalman@chromium.org diff --git a/components/components.gyp b/components/components.gyp index aa24986..4bd2e71 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -16,6 +16,7 @@ 'cloud_devices.gypi', 'dom_distiller.gypi', 'domain_reliability.gypi', + 'favicon.gypi', 'json_schema.gypi', 'keyed_service.gypi', 'language_usage_metrics.gypi', diff --git a/components/favicon.gypi b/components/favicon.gypi new file mode 100644 index 0000000..32ec54b --- /dev/null +++ b/components/favicon.gypi @@ -0,0 +1,15 @@ +# 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. + +{ + 'targets': [ + { + 'target_name': 'favicon_core', + 'type': 'none', + 'sources': [ + 'favicon/core/favicon_handler_delegate.h', + ], + }, + ], +} diff --git a/components/favicon/DEPS b/components/favicon/DEPS new file mode 100644 index 0000000..48e8875 --- /dev/null +++ b/components/favicon/DEPS @@ -0,0 +1,2 @@ +include_rules = [ +] diff --git a/components/favicon/OWNERS b/components/favicon/OWNERS new file mode 100644 index 0000000..a5bd8bd --- /dev/null +++ b/components/favicon/OWNERS @@ -0,0 +1,2 @@ +sky@chromium.org +stevenjb@chromium.org
\ No newline at end of file diff --git a/components/favicon/README b/components/favicon/README new file mode 100644 index 0000000..a2ee569 --- /dev/null +++ b/components/favicon/README @@ -0,0 +1,9 @@ +Favicon is in the process of becoming a layered component +(https://sites.google.com/a/chromium.org/dev/developers/design-documents/layered-components-design) +to enable it to be shared cleanly on iOS. + +When this process is complete, this component will have the following structure: + +- core/: shared code that does not depend on src/content/ or src/ios/ +- content/: Driver for the shared code based on the content layer. +- ios/: Driver for the shared code based on src/ios. diff --git a/chrome/browser/favicon/favicon_handler_delegate.h b/components/favicon/core/favicon_handler_delegate.h index 5c3deb9..2621902 100644 --- a/chrome/browser/favicon/favicon_handler_delegate.h +++ b/components/favicon/core/favicon_handler_delegate.h @@ -1,13 +1,14 @@ -// 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 CHROME_BROWSER_FAVICON_FAVICON_HANDLER_DELEGATE_H_ -#define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_DELEGATE_H_ +#ifndef COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_DELEGATE_H_ +#define COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_DELEGATE_H_ class GURL; namespace content { +// TODO(jif): Abstract the NavigationEntry (crbug.com/359598). class NavigationEntry; } @@ -17,6 +18,7 @@ class NavigationEntry; class FaviconHandlerDelegate { public: // Returns the current NavigationEntry. + // TODO(jif): Abstract the NavigationEntry (crbug.com/359598). virtual content::NavigationEntry* GetActiveEntry() = 0; // Starts the download for the given favicon. When finished, the delegate @@ -35,4 +37,4 @@ class FaviconHandlerDelegate { virtual void NotifyFaviconUpdated(bool icon_url_changed) = 0; }; -#endif // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_DELEGATE_H_ +#endif // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_DELEGATE_H_ |