diff options
29 files changed, 35 insertions, 35 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 0b4ff35..64ecf8c 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -105,7 +105,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/extensions/url_pattern_set.h" diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc index 83b9df2..6383b81 100644 --- a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc +++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc @@ -22,7 +22,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/pref_names.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 7ed5730..371dbb1 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -24,7 +24,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index a116ee7..89ad53b 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -17,7 +17,7 @@ #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/extensions/extension_view.h" diff --git a/chrome/browser/extensions/extension_host_mac.mm b/chrome/browser/extensions/extension_host_mac.mm index 424db46..27eec1e 100644 --- a/chrome/browser/extensions/extension_host_mac.mm +++ b/chrome/browser/extensions/extension_host_mac.mm @@ -7,7 +7,7 @@ #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "content/public/browser/native_web_keyboard_event.h" diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index c807206..4f60ea3 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -19,7 +19,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h index 6c1445d..6553858 100644 --- a/chrome/browser/extensions/extension_process_manager.h +++ b/chrome/browser/extensions/extension_process_manager.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_webkit_preferences.h b/chrome/browser/extensions/extension_webkit_preferences.h index e035294..824104d 100644 --- a/chrome/browser/extensions/extension_webkit_preferences.h +++ b/chrome/browser/extensions/extension_webkit_preferences.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBKIT_PREFERENCES_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBKIT_PREFERENCES_H_ -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" class Extension; struct WebPreferences; diff --git a/chrome/browser/extensions/network_delay_listener.cc b/chrome/browser/extensions/network_delay_listener.cc index 40c8919..b55b9d3 100644 --- a/chrome/browser/extensions/network_delay_listener.cc +++ b/chrome/browser/extensions/network_delay_listener.cc @@ -10,7 +10,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/extensions/network_delay_listener_unittest.cc b/chrome/browser/extensions/network_delay_listener_unittest.cc index 74d0bc9..ff3a975 100644 --- a/chrome/browser/extensions/network_delay_listener_unittest.cc +++ b/chrome/browser/extensions/network_delay_listener_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/test/base/testing_profile.h" #include "content/browser/mock_resource_context.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 62671c2..2a902df 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -13,7 +13,7 @@ #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_child_process_host.h" diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index d27c45e..095f3f9 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -13,7 +13,7 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc index 3e3c0f4..fb6db00 100644 --- a/chrome/browser/tab_contents/background_contents.cc +++ b/chrome/browser/tab_contents/background_contents.cc @@ -12,7 +12,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "content/browser/browsing_instance.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 79a9c42..2e5707b 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -25,7 +25,7 @@ #include "chrome/browser/tab_contents/background_contents.h" #include "chrome/browser/user_style_sheet_watcher.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/pref_names.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/gpu/gpu_data_manager.h" diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 9557877..063b586 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -25,7 +25,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 7c23e17..1014a93 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -36,7 +36,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index 56a4a86..6dff20f 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -26,7 +26,7 @@ #include "chrome/browser/tab_contents/background_contents.h" #include "chrome/browser/ui/webui/extension_icon_source.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 15a2ed54..6fc8851 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -226,8 +226,8 @@ 'common/time_format.h', 'common/url_constants.cc', 'common/url_constants.h', - 'common/chrome_view_types.cc', - 'common/chrome_view_types.h', + 'common/chrome_view_type.cc', + 'common/chrome_view_type.h', 'common/visitedlink_common.cc', 'common/visitedlink_common.h', 'common/web_apps.cc', diff --git a/chrome/common/chrome_view_types.cc b/chrome/common/chrome_view_type.cc index 99a7463..8d5ffba 100644 --- a/chrome/common/chrome_view_types.cc +++ b/chrome/common/chrome_view_type.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/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" namespace chrome { const char kViewTypeTabContents[] = "TAB"; diff --git a/chrome/common/chrome_view_types.h b/chrome/common/chrome_view_type.h index a5e5b6b..926c1bd 100644 --- a/chrome/common/chrome_view_types.h +++ b/chrome/common/chrome_view_type.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_CHROME_VIEW_TYPES_H_ -#define CHROME_COMMON_CHROME_VIEW_TYPES_H_ +#ifndef CHROME_COMMON_CHROME_VIEW_TYPE_H_ +#define CHROME_COMMON_CHROME_VIEW_TYPE_H_ #pragma once -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" namespace chrome { @@ -34,4 +34,4 @@ extern const char kViewTypeAll[]; } // namespace chrome -#endif // CHROME_COMMON_CHROME_VIEW_TYPES_H_ +#endif // CHROME_COMMON_CHROME_VIEW_TYPE_H_ diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h index 9a5e8cbb..0d4f1b8 100644 --- a/chrome/common/extensions/extension_messages.h +++ b/chrome/common/extensions/extension_messages.h @@ -12,7 +12,7 @@ #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/extensions/url_pattern_set.h" #include "chrome/common/web_apps.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #include "ipc/ipc_message_macros.h" #define IPC_MESSAGE_START ExtensionMsgStart diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index 810f042..6b01c69 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" diff --git a/chrome/renderer/extensions/extension_helper.h b/chrome/renderer/extensions/extension_helper.h index 3542587..beef54d 100644 --- a/chrome/renderer/extensions/extension_helper.h +++ b/chrome/renderer/extensions/extension_helper.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" class ExtensionDispatcher; diff --git a/chrome/renderer/extensions/schema_generated_bindings.cc b/chrome/renderer/extensions/schema_generated_bindings.cc index 323a6d5..9af30a7 100644 --- a/chrome/renderer/extensions/schema_generated_bindings.cc +++ b/chrome/renderer/extensions/schema_generated_bindings.cc @@ -26,7 +26,7 @@ #include "chrome/common/extensions/api/extension_api.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "chrome/common/chrome_view_types.h" +#include "chrome/common/chrome_view_type.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" #include "chrome/renderer/chrome_render_process_observer.h" diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index 10f307b..658ee03 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -16,7 +16,7 @@ #include "base/string16.h" #include "base/values.h" #include "content/common/content_export.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #include "content/public/common/window_container_type.h" #include "ipc/ipc_channel.h" #include "net/base/load_states.h" diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc index de17cc9..a3c243f 100644 --- a/content/browser/speech/speech_input_manager.cc +++ b/content/browser/speech/speech_input_manager.cc @@ -9,7 +9,7 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/speech/speech_input_preferences.h" #include "content/public/browser/browser_thread.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #include "media/audio/audio_manager.h" using content::BrowserThread; diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc index a960433..e50ba12 100644 --- a/content/browser/tab_contents/interstitial_page.cc +++ b/content/browser/tab_contents/interstitial_page.cc @@ -29,7 +29,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/page_transition_types.h" -#include "content/public/common/view_types.h" +#include "content/public/common/view_type.h" #include "net/base/escape.h" #include "net/url_request/url_request_context_getter.h" diff --git a/content/content_common.gypi b/content/content_common.gypi index 4dfdcf9..899e2fa1 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -72,7 +72,7 @@ 'public/common/url_fetcher.h', 'public/common/url_fetcher_delegate.h', 'public/common/url_fetcher_factory.h', - 'public/common/view_types.h', + 'public/common/view_type.h', 'public/common/zygote_fork_delegate_linux.h', 'common/appcache/appcache_backend_proxy.cc', 'common/appcache/appcache_backend_proxy.h', diff --git a/content/public/common/view_types.h b/content/public/common/view_type.h index 499be02..9c0f0dc 100644 --- a/content/public/common/view_types.h +++ b/content/public/common/view_type.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_PUBLIC_COMMON_VIEW_TYPES_H_ -#define CONTENT_PUBLIC_COMMON_VIEW_TYPES_H_ +#ifndef CONTENT_PUBLIC_COMMON_VIEW_TYPE_H_ +#define CONTENT_PUBLIC_COMMON_VIEW_TYPE_H_ #pragma once namespace content { @@ -22,4 +22,4 @@ typedef int ViewType; } // namespace content -#endif // CONTENT_PUBLIC_COMMON_VIEW_TYPES_H_ +#endif // CONTENT_PUBLIC_COMMON_VIEW_TYPE_H_ |