diff options
Diffstat (limited to 'chrome')
5 files changed, 14 insertions, 12 deletions
diff --git a/chrome/browser/autofill/autofill_xml_parser.h b/chrome/browser/autofill/autofill_xml_parser.h index d54dc67..1fda2fe 100644 --- a/chrome/browser/autofill/autofill_xml_parser.h +++ b/chrome/browser/autofill/autofill_xml_parser.h @@ -13,8 +13,6 @@ #include "third_party/expat/files/lib/expat.h" #include "third_party/libjingle/files/talk/xmllite/xmlparser.h" -enum UploadRequired; - // The base class that contains common functionality between // AutoFillQueryXmlParser and AutoFillUploadXmlParser. class AutoFillXmlParser : public buzz::XmlParseHandler { diff --git a/chrome/browser/extensions/extension_accessibility_api_constants.cc b/chrome/browser/extensions/extension_accessibility_api_constants.cc index 8f52e14..81e60e8 100644 --- a/chrome/browser/extensions/extension_accessibility_api_constants.cc +++ b/chrome/browser/extensions/extension_accessibility_api_constants.cc @@ -26,14 +26,14 @@ const char kOnControlAction[] = "experimental.accessibility.onControlAction"; const char kOnTextChanged[] = "experimental.accessibility.onTextChanged"; // Types of controls that can receive accessibility events. -extern const char kTypeButton[] = "button"; -extern const char kTypeCheckbox[] = "checkbox"; -extern const char kTypeComboBox[] = "combobox"; -extern const char kTypeLink[] = "link"; -extern const char kTypeListBox[] = "listbox"; -extern const char kTypeRadioButton[] = "radiobutton"; -extern const char kTypeTab[] = "tab"; -extern const char kTypeTextBox[] = "textbox"; -extern const char kTypeWindow[] = "window"; +const char kTypeButton[] = "button"; +const char kTypeCheckbox[] = "checkbox"; +const char kTypeComboBox[] = "combobox"; +const char kTypeLink[] = "link"; +const char kTypeListBox[] = "listbox"; +const char kTypeRadioButton[] = "radiobutton"; +const char kTypeTab[] = "tab"; +const char kTypeTextBox[] = "textbox"; +const char kTypeWindow[] = "window"; } // namespace extension_accessibility_api_constants diff --git a/chrome/browser/sessions/tab_restore_service.h b/chrome/browser/sessions/tab_restore_service.h index f8488e1..8aacc9c 100644 --- a/chrome/browser/sessions/tab_restore_service.h +++ b/chrome/browser/sessions/tab_restore_service.h @@ -13,6 +13,7 @@ #include "base/time.h" #include "chrome/browser/sessions/base_session_service.h" #include "chrome/browser/sessions/session_id.h" +#include "chrome/browser/sessions/session_types.h" class Browser; class NavigationController; diff --git a/chrome/common/extensions/extension_message_bundle.h b/chrome/common/extensions/extension_message_bundle.h index d483ba0..3085b50 100644 --- a/chrome/common/extensions/extension_message_bundle.h +++ b/chrome/common/extensions/extension_message_bundle.h @@ -10,6 +10,7 @@ #include <vector> #include "base/linked_ptr.h" +#include "base/string_util.h" #include "base/values.h" // Contains localized extension messages for one locale. Any messages that the diff --git a/chrome/common/process_watcher_posix.cc b/chrome/common/process_watcher_posix.cc index c0ea178..4b13c32 100644 --- a/chrome/common/process_watcher_posix.cc +++ b/chrome/common/process_watcher_posix.cc @@ -10,6 +10,7 @@ #include <sys/wait.h> #include "base/eintr_wrapper.h" +#include "base/logging.h" #include "base/platform_thread.h" // Return true if the given child is dead. This will also reap the process. @@ -65,7 +66,8 @@ class BackgroundReaper : public PlatformThread::Delegate { if (kill(child_, SIGKILL) == 0) { // SIGKILL is uncatchable. Since the signal was delivered, we can // just wait for the process to die now in a blocking manner. - HANDLE_EINTR(waitpid(child_, NULL, 0)); + if (HANDLE_EINTR(waitpid(child_, NULL, 0)) < 0) + PLOG(WARNING) << "waitpid"; } else { LOG(ERROR) << "While waiting for " << child_ << " to terminate we" << " failed to deliver a SIGKILL signal (" << errno << ")."; |