From 4b790884a323692bcb2dd227b9636c84f39f9de6 Mon Sep 17 00:00:00 2001 From: "rockot@chromium.org" Date: Mon, 7 Apr 2014 23:50:22 +0000 Subject: Move extension_icon_set.{h,cc} to //extensions This has no //chrome dependencies and can be moved. This change is purely mechanical. BUG=359836 TBR=atwilson@chromium.org (background) TBR=davemoor@chromium.org (c/b/chromeos) TBR=rohitrao@chromium.org (c/b/ui/cocoa/infobars) TBR=erg@chromium.org (c/b/ui/gtk) TBR=benwells@chromium.org (c/b/ui/views/apps, app_list) TBR=pkasting@chromium.org (c/b/ui/views/infobars) TBR=xiyuan@chromium.org (c/b/ui/webui) TBR=finnur@chromium.org (c/b/ui/webui/extensions) TBR=estade@chromium.org (ntp) Review URL: https://codereview.chromium.org/225043002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262253 0039d316-1c4b-4281-b951-d872f2087c98 --- .../background_application_list_model.cc | 2 +- .../background/background_contents_service.cc | 2 +- .../chromeos/login/merge_session_load_page.cc | 2 +- .../browser/chromeos/offline/offline_load_page.cc | 2 +- .../extensions/api/management/management_api.cc | 2 +- .../extensions/bookmark_app_helper_unittest.cc | 2 +- .../extensions/convert_web_app_browsertest.cc | 2 +- .../browser/extensions/convert_web_app_unittest.cc | 2 +- chrome/browser/extensions/crx_installer.cc | 2 +- chrome/browser/extensions/extension_action.h | 2 +- .../extensions/extension_action_icon_factory.cc | 2 +- chrome/browser/extensions/extension_disabled_ui.cc | 2 +- chrome/browser/extensions/extension_icon_image.h | 2 +- .../browser/extensions/extension_icon_manager.cc | 2 +- .../browser/extensions/extension_install_prompt.cc | 2 +- .../extensions/extension_uninstall_dialog.cc | 2 +- chrome/browser/extensions/extension_util.cc | 2 +- chrome/browser/extensions/extension_web_ui.cc | 2 +- chrome/browser/extensions/image_loader_unittest.cc | 2 +- chrome/browser/extensions/tab_helper.cc | 2 +- chrome/browser/ui/app_list/extension_app_item.cc | 2 +- chrome/browser/ui/app_list/search/app_result.cc | 2 +- .../cocoa/infobars/extension_infobar_controller.mm | 2 +- .../ui/gtk/infobars/extension_infobar_gtk.cc | 2 +- .../apps/app_info_dialog/app_info_summary_tab.cc | 2 +- .../browser/ui/views/infobars/extension_infobar.cc | 2 +- .../ui/webui/app_list/start_page_handler.cc | 2 +- .../ui/webui/extensions/extension_icon_source.h | 2 +- .../ui/webui/extensions/extension_info_ui.cc | 2 +- .../webui/extensions/extension_settings_handler.cc | 2 +- .../browser/ui/webui/ntp/app_launcher_handler.cc | 2 +- chrome/chrome_common.gypi | 2 - .../extensions/api/extension_action/action_info.h | 2 +- .../browser_action_manifest_unittest.cc | 2 +- chrome/common/extensions/extension_file_util.cc | 2 +- chrome/common/extensions/extension_icon_set.cc | 70 ---------------------- chrome/common/extensions/extension_icon_set.h | 52 ---------------- .../extensions/extension_icon_set_unittest.cc | 2 +- .../common/extensions/manifest_handler_helpers.cc | 2 +- .../extensions/manifest_handlers/icons_handler.h | 2 +- .../extension_manifests_icons_unittest.cc | 2 +- chrome/common/localized_error.cc | 2 +- extensions/common/extension_icon_set.cc | 70 ++++++++++++++++++++++ extensions/common/extension_icon_set.h | 52 ++++++++++++++++ extensions/extensions.gyp | 2 + 45 files changed, 163 insertions(+), 163 deletions(-) delete mode 100644 chrome/common/extensions/extension_icon_set.cc delete mode 100644 chrome/common/extensions/extension_icon_set.h create mode 100644 extensions/common/extension_icon_set.cc create mode 100644 extensions/common/extension_icon_set.h diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 21122bd..7409c0c 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -21,7 +21,6 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" @@ -29,6 +28,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index c05cec3..ee28ac4 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -33,7 +33,6 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" @@ -43,6 +42,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/merge_session_load_page.cc index 993242f..eb56503 100644 --- a/chrome/browser/chromeos/login/merge_session_load_page.cc +++ b/chrome/browser/chromeos/login/merge_session_load_page.cc @@ -20,7 +20,6 @@ #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/interstitial_page.h" @@ -28,6 +27,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index b318cf8..79a9190 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -22,7 +22,6 @@ #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/localized_error.h" #include "chrome/common/pref_names.h" @@ -33,6 +32,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index e796814..11ee846 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -30,7 +30,6 @@ #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/api/management.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" @@ -45,6 +44,7 @@ #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest_handlers/offline_enabled_info.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/bookmark_app_helper_unittest.cc b/chrome/browser/extensions/bookmark_app_helper_unittest.cc index 6a9d376..78c7dd0 100644 --- a/chrome/browser/extensions/bookmark_app_helper_unittest.cc +++ b/chrome/browser/extensions/bookmark_app_helper_unittest.cc @@ -6,11 +6,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service_unittest.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/test/base/testing_profile.h" #include "extensions/browser/extension_registry.h" +#include "extensions/common/extension_icon_set.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc index 978110c..0ab8937 100644 --- a/chrome/browser/extensions/convert_web_app_browsertest.cc +++ b/chrome/browser/extensions/convert_web_app_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/test/base/in_process_browser_test.h" @@ -24,6 +23,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/permissions/permission_set.h" namespace extensions { diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 28649bc..964fdb4 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -16,11 +16,11 @@ #include "base/time/time.h" #include "base/version.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/web_application_info.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index ad7c18d..2ec8402 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -37,13 +37,13 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/kiosk_mode_info.h" diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h index e929041..82b8188 100644 --- a/chrome/browser/extensions/extension_action.h +++ b/chrome/browser/extensions/extension_action.h @@ -16,7 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension_icon_set.h" +#include "extensions/common/extension_icon_set.h" #include "third_party/skia/include/core/SkColor.h" // TODO(robertphillips): change this to "class SkBaseDevice;" #include "third_party/skia/include/core/SkDevice.h" diff --git a/chrome/browser/extensions/extension_action_icon_factory.cc b/chrome/browser/extensions/extension_action_icon_factory.cc index 28779a0..17a0b87 100644 --- a/chrome/browser/extensions/extension_action_icon_factory.cc +++ b/chrome/browser/extensions/extension_action_icon_factory.cc @@ -6,8 +6,8 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index 605a012..d600e71 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -26,13 +26,13 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/extension_icon_image.h b/chrome/browser/extensions/extension_icon_image.h index b6fc0c4..5397895 100644 --- a/chrome/browser/extensions/extension_icon_image.h +++ b/chrome/browser/extensions/extension_icon_image.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/extension_icon_set.h" #include "ui/base/layout.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index 917c49f..ccdf6b7 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -8,10 +8,10 @@ #include "base/logging.h" #include "base/stl_util.h" #include "chrome/browser/extensions/image_loader.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 9488c4d..1614368 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -22,7 +22,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/pref_names.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" @@ -30,6 +29,7 @@ #include "content/public/browser/web_contents_view.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc index 09300de..31aef19 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.cc +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc @@ -12,12 +12,12 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc index 2cdd2cc..41d535d 100644 --- a/chrome/browser/extensions/extension_util.cc +++ b/chrome/browser/extensions/extension_util.cc @@ -12,7 +12,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/extensions/sync_helper.h" #include "content/public/browser/site_instance.h" @@ -20,6 +19,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/incognito_info.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 4f89a1f..45deef9 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -21,7 +21,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "components/user_prefs/pref_registry_syncable.h" @@ -32,6 +31,7 @@ #include "content/public/common/page_transition_types.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_handlers/incognito_info.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/chrome/browser/extensions/image_loader_unittest.cc index 70f843c..07a8317 100644 --- a/chrome/browser/extensions/image_loader_unittest.cc +++ b/chrome/browser/extensions/image_loader_unittest.cc @@ -9,12 +9,12 @@ #include "base/path_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest.h" #include "grit/component_extension_resources.h" diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index d38c151..5f7de27 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -38,7 +38,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/chrome_extension_messages.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/render_messages.h" @@ -60,6 +59,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_messages.h" #include "extensions/common/extension_resource.h" #include "extensions/common/extension_urls.h" diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc index ceef6fb..cb2ca65 100644 --- a/chrome/browser/ui/app_list/extension_app_item.cc +++ b/chrome/browser/ui/app_list/extension_app_item.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/user_metrics.h" @@ -26,6 +25,7 @@ #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "grit/theme_resources.h" #include "sync/api/string_ordinal.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/app_list/search/app_result.cc b/chrome/browser/ui/app_list/search/app_result.cc index 77e9b93..6f96f6e 100644 --- a/chrome/browser/ui/app_list/search/app_result.cc +++ b/chrome/browser/ui/app_list/search/app_result.cc @@ -15,13 +15,13 @@ #include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "chrome/browser/ui/extensions/extension_enable_flow.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm index ef8a23b..0790e26 100644 --- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm @@ -16,12 +16,12 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.h" #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" #import "chrome/browser/ui/cocoa/menu_button.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc index d55dbb1..e7ee643 100644 --- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc @@ -14,12 +14,12 @@ #include "chrome/browser/ui/gtk/gtk_chrome_button.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal_registrar.h" diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.cc index ccbdd41..bbb038c 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_tab.cc @@ -16,11 +16,11 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "grit/generated_resources.h" #include "net/base/url_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc index bef71a0..25cff81 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.cc +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc @@ -10,10 +10,10 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.cc b/chrome/browser/ui/webui/app_list/start_page_handler.cc index be6403d..39171b4 100644 --- a/chrome/browser/ui/webui/app_list/start_page_handler.cc +++ b/chrome/browser/ui/webui/app_list/start_page_handler.cc @@ -19,7 +19,6 @@ #include "chrome/browser/ui/app_list/start_page_service.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" @@ -27,6 +26,7 @@ #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "ui/app_list/app_list_switches.h" #include "ui/app_list/speech_ui_model_observer.h" #include "ui/events/event_constants.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index b5ea9fd..d961055 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h @@ -12,8 +12,8 @@ #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "content/public/browser/url_data_source.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc index 33c6fe9..5544c0d 100644 --- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc +++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc @@ -13,13 +13,13 @@ #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 1e3a954..12db280 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -53,7 +53,6 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -80,6 +79,7 @@ #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_set.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index fdfdcad..c34ee9a 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -37,7 +37,6 @@ #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/favicon/favicon_types.h" #include "chrome/common/pref_names.h" @@ -53,6 +52,7 @@ #include "extensions/browser/pref_names.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_set.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 2e0bc3d..99e2ac3 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -165,8 +165,6 @@ 'common/extensions/extension_constants.h', 'common/extensions/extension_file_util.cc', 'common/extensions/extension_file_util.h', - 'common/extensions/extension_icon_set.cc', - 'common/extensions/extension_icon_set.h', 'common/extensions/extension_l10n_util.cc', 'common/extensions/extension_l10n_util.h', 'common/extensions/extension_process_policy.cc', diff --git a/chrome/common/extensions/api/extension_action/action_info.h b/chrome/common/extensions/api/extension_action/action_info.h index 1192c29..09e497c 100644 --- a/chrome/common/extensions/api/extension_action/action_info.h +++ b/chrome/common/extensions/api/extension_action/action_info.h @@ -8,8 +8,8 @@ #include #include "base/strings/string16.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "url/gurl.h" namespace base { diff --git a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc index b2f223f..af73d5b 100644 --- a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc +++ b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension_builder.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/value_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index 814dde5..b5f1266 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -19,13 +19,13 @@ #include "base/threading/thread_restrictions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_handlers/theme_handler.h" #include "chrome/common/extensions/message_bundle.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_messages.h" #include "extensions/common/extension_resource.h" #include "extensions/common/install_warning.h" diff --git a/chrome/common/extensions/extension_icon_set.cc b/chrome/common/extensions/extension_icon_set.cc deleted file mode 100644 index bb8c763..0000000 --- a/chrome/common/extensions/extension_icon_set.cc +++ /dev/null @@ -1,70 +0,0 @@ -// 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. - -#include "chrome/common/extensions/extension_icon_set.h" - -#include "base/logging.h" - -ExtensionIconSet::ExtensionIconSet() {} - -ExtensionIconSet::~ExtensionIconSet() {} - -void ExtensionIconSet::Clear() { - map_.clear(); -} - -void ExtensionIconSet::Add(int size, const std::string& path) { - DCHECK(!path.empty() && path[0] != '/'); - map_[size] = path; -} - -std::string ExtensionIconSet::Get(int size, MatchType match_type) const { - // The searches for MATCH_BIGGER and MATCH_SMALLER below rely on the fact that - // std::map is sorted. This is per the spec, so it should be safe to rely on. - if (match_type == MATCH_EXACTLY) { - IconMap::const_iterator result = map_.find(size); - return result == map_.end() ? std::string() : result->second; - } else if (match_type == MATCH_SMALLER) { - IconMap::const_reverse_iterator result = map_.rend(); - for (IconMap::const_reverse_iterator iter = map_.rbegin(); - iter != map_.rend(); ++iter) { - if (iter->first <= size) { - result = iter; - break; - } - } - return result == map_.rend() ? std::string() : result->second; - } else { - DCHECK(match_type == MATCH_BIGGER); - IconMap::const_iterator result = map_.end(); - for (IconMap::const_iterator iter = map_.begin(); iter != map_.end(); - ++iter) { - if (iter->first >= size) { - result = iter; - break; - } - } - return result == map_.end() ? std::string() : result->second; - } -} - -bool ExtensionIconSet::ContainsPath(const std::string& path) const { - return GetIconSizeFromPath(path) != 0; -} - -int ExtensionIconSet::GetIconSizeFromPath(const std::string& path) const { - if (path.empty()) - return 0; - - DCHECK(path[0] != '/') << - "ExtensionIconSet stores icon paths without leading slash."; - - for (IconMap::const_iterator iter = map_.begin(); iter != map_.end(); - ++iter) { - if (iter->second == path) - return iter->first; - } - - return 0; -} diff --git a/chrome/common/extensions/extension_icon_set.h b/chrome/common/extensions/extension_icon_set.h deleted file mode 100644 index 487099e..0000000 --- a/chrome/common/extensions/extension_icon_set.h +++ /dev/null @@ -1,52 +0,0 @@ -// 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. - -#ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_ICON_SET_H_ -#define CHROME_COMMON_EXTENSIONS_EXTENSION_ICON_SET_H_ - -#include -#include - -// Represents the set of icons for an extension. -class ExtensionIconSet { - public: - // Get an icon from the set, optionally falling back to a smaller or bigger - // size. MatchType is exclusive (do not OR them together). - enum MatchType { - MATCH_EXACTLY, - MATCH_BIGGER, - MATCH_SMALLER - }; - - // Access to the underlying map from icon size->{path, bitmap}. - typedef std::map IconMap; - - ExtensionIconSet(); - ~ExtensionIconSet(); - - const IconMap& map() const { return map_; } - bool empty() const { return map_.empty(); } - - // Remove all icons from the set. - void Clear(); - - // Add an icon path to the set. If a path for the specified size is already - // present, it is overwritten. - void Add(int size, const std::string& path); - - // Gets path value of the icon found when searching for |size| using - // |mathc_type|. - std::string Get(int size, MatchType match_type) const; - - // Returns true iff the set contains the specified path. - bool ContainsPath(const std::string& path) const; - - // Returns icon size if the set contains the specified path or 0 if not found. - int GetIconSizeFromPath(const std::string& path) const; - - private: - IconMap map_; -}; - -#endif // CHROME_COMMON_EXTENSIONS_EXTENSION_ICON_SET_H_ diff --git a/chrome/common/extensions/extension_icon_set_unittest.cc b/chrome/common/extensions/extension_icon_set_unittest.cc index b286f38..c5c01e9 100644 --- a/chrome/common/extensions/extension_icon_set_unittest.cc +++ b/chrome/common/extensions/extension_icon_set_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/extensions/extension_icon_set.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_handler_helpers.cc b/chrome/common/extensions/manifest_handler_helpers.cc index f46fd31..5c6a9d2 100644 --- a/chrome/common/extensions/manifest_handler_helpers.cc +++ b/chrome/common/extensions/manifest_handler_helpers.cc @@ -8,9 +8,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/manifest_handlers/icons_handler.h b/chrome/common/extensions/manifest_handlers/icons_handler.h index 2303755..9c4d42f5 100644 --- a/chrome/common/extensions/manifest_handlers/icons_handler.h +++ b/chrome/common/extensions/manifest_handlers/icons_handler.h @@ -7,8 +7,8 @@ #include -#include "chrome/common/extensions/extension_icon_set.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc index 8679793c0..8338713 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/memory/linked_ptr.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/common/extension_icon_set.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc index cd2de49..85845f8 100644 --- a/chrome/common/localized_error.cc +++ b/chrome/common/localized_error.cc @@ -11,10 +11,10 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/net/net_error_info.h" #include "extensions/common/constants.h" +#include "extensions/common/extension_icon_set.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/extensions/common/extension_icon_set.cc b/extensions/common/extension_icon_set.cc new file mode 100644 index 0000000..a91b9bc --- /dev/null +++ b/extensions/common/extension_icon_set.cc @@ -0,0 +1,70 @@ +// 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 "extensions/common/extension_icon_set.h" + +#include "base/logging.h" + +ExtensionIconSet::ExtensionIconSet() {} + +ExtensionIconSet::~ExtensionIconSet() {} + +void ExtensionIconSet::Clear() { + map_.clear(); +} + +void ExtensionIconSet::Add(int size, const std::string& path) { + DCHECK(!path.empty() && path[0] != '/'); + map_[size] = path; +} + +std::string ExtensionIconSet::Get(int size, MatchType match_type) const { + // The searches for MATCH_BIGGER and MATCH_SMALLER below rely on the fact that + // std::map is sorted. This is per the spec, so it should be safe to rely on. + if (match_type == MATCH_EXACTLY) { + IconMap::const_iterator result = map_.find(size); + return result == map_.end() ? std::string() : result->second; + } else if (match_type == MATCH_SMALLER) { + IconMap::const_reverse_iterator result = map_.rend(); + for (IconMap::const_reverse_iterator iter = map_.rbegin(); + iter != map_.rend(); ++iter) { + if (iter->first <= size) { + result = iter; + break; + } + } + return result == map_.rend() ? std::string() : result->second; + } else { + DCHECK(match_type == MATCH_BIGGER); + IconMap::const_iterator result = map_.end(); + for (IconMap::const_iterator iter = map_.begin(); iter != map_.end(); + ++iter) { + if (iter->first >= size) { + result = iter; + break; + } + } + return result == map_.end() ? std::string() : result->second; + } +} + +bool ExtensionIconSet::ContainsPath(const std::string& path) const { + return GetIconSizeFromPath(path) != 0; +} + +int ExtensionIconSet::GetIconSizeFromPath(const std::string& path) const { + if (path.empty()) + return 0; + + DCHECK(path[0] != '/') << + "ExtensionIconSet stores icon paths without leading slash."; + + for (IconMap::const_iterator iter = map_.begin(); iter != map_.end(); + ++iter) { + if (iter->second == path) + return iter->first; + } + + return 0; +} diff --git a/extensions/common/extension_icon_set.h b/extensions/common/extension_icon_set.h new file mode 100644 index 0000000..6a7697b --- /dev/null +++ b/extensions/common/extension_icon_set.h @@ -0,0 +1,52 @@ +// 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 EXTENSIONS_COMMON_EXTENSION_ICON_SET_H_ +#define EXTENSIONS_COMMON_EXTENSION_ICON_SET_H_ + +#include +#include + +// Represents the set of icons for an extension. +class ExtensionIconSet { + public: + // Get an icon from the set, optionally falling back to a smaller or bigger + // size. MatchType is exclusive (do not OR them together). + enum MatchType { + MATCH_EXACTLY, + MATCH_BIGGER, + MATCH_SMALLER + }; + + // Access to the underlying map from icon size->{path, bitmap}. + typedef std::map IconMap; + + ExtensionIconSet(); + ~ExtensionIconSet(); + + const IconMap& map() const { return map_; } + bool empty() const { return map_.empty(); } + + // Remove all icons from the set. + void Clear(); + + // Add an icon path to the set. If a path for the specified size is already + // present, it is overwritten. + void Add(int size, const std::string& path); + + // Gets path value of the icon found when searching for |size| using + // |mathc_type|. + std::string Get(int size, MatchType match_type) const; + + // Returns true iff the set contains the specified path. + bool ContainsPath(const std::string& path) const; + + // Returns icon size if the set contains the specified path or 0 if not found. + int GetIconSizeFromPath(const std::string& path) const; + + private: + IconMap map_; +}; + +#endif // EXTENSIONS_COMMON_EXTENSION_ICON_SET_H_ diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index f941aef..bb1a012 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -64,6 +64,8 @@ 'common/extension_api.cc', 'common/extension_api.h', 'common/extension_api_stub.cc', + 'common/extension_icon_set.cc', + 'common/extension_icon_set.h', 'common/extension_message_generator.cc', 'common/extension_message_generator.h', 'common/extension_messages.cc', -- cgit v1.1