diff options
Diffstat (limited to 'chrome/browser/renderer_context_menu')
13 files changed, 22 insertions, 4 deletions
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h b/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h index 4a7d81f..27ca8d8 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_app_mode.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_APP_MODE_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_APP_MODE_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" class ContextMenuContentTypeAppMode : public ContextMenuContentType { diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h b/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h index 7f35b1d..5d765a2 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_extension_popup.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_EXTENSION_POPUP_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_EXTENSION_POPUP_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" class ContextMenuContentTypeExtensionPopup : public ContextMenuContentType { diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h index d4401e2..990c03a 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_FACTORY_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_FACTORY_H_ +#include "base/macros.h" #include "content/public/common/context_menu_params.h" class ContextMenuContentType; diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h b/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h index 9718a18..8ce517c 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_panel.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PANEL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PANEL_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" class ContextMenuContentTypePanel : public ContextMenuContentType { diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h index 5f65b26..1dccf81 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PLATFORM_APP_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_CONTEXT_MENU_CONTENT_TYPE_PLATFORM_APP_H_ +#include "base/macros.h" #include "components/renderer_context_menu/context_menu_content_type.h" namespace extensions { diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index e832a03..aab6e15 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -4,6 +4,8 @@ #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <utility> @@ -11,6 +13,7 @@ #include "apps/app_load_service.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" @@ -18,6 +21,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h index df77e1f..f06d545 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/strings/string16.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index 7c4f707..f3839a8 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc @@ -12,6 +12,7 @@ #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h index e2b5783..46b3548 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BROWSERTEST_UTIL_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h b/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h index c0fc272..b038594 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_TEST_UTIL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_TEST_UTIL_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "url/gurl.h" diff --git a/chrome/browser/renderer_context_menu/spelling_bubble_model.h b/chrome/browser/renderer_context_menu/spelling_bubble_model.h index 3aeafa8..e8905f8 100644 --- a/chrome/browser/renderer_context_menu/spelling_bubble_model.h +++ b/chrome/browser/renderer_context_menu/spelling_bubble_model.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_BUBBLE_MODEL_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_BUBBLE_MODEL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/confirm_bubble_model.h" class Profile; diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.h b/chrome/browser/renderer_context_menu/spelling_menu_observer.h index adfead7..a98e7b5 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer.h +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.h @@ -5,9 +5,13 @@ #ifndef CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_MENU_OBSERVER_H_ #define CHROME_BROWSER_RENDERER_CONTEXT_MENU_SPELLING_MENU_OBSERVER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_member.h" #include "base/strings/string16.h" @@ -90,7 +94,7 @@ class SpellingMenuObserver : public RenderViewContextMenuObserver { // The hash identifier for the misspelled word. Used for collecting user // feedback to spellcheck suggestions. - uint32 misspelling_hash_; + uint32_t misspelling_hash_; // The string representing the result of this call. This string is a // suggestion when this call finished successfully. Otherwise it is error diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc index 8b7a446..5a68502 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc @@ -4,8 +4,11 @@ #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" |