From 8cc81509d7577c26a2e0ccbdfbdfbd15efc63edd Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 17 Apr 2018 21:47:44 -0400 Subject: [PATCH] clang-format chromium_src --- .../browser/certificate_manager_model.h | 12 +- .../extensions/global_shortcut_listener_mac.h | 16 +- .../extensions/global_shortcut_listener_x11.h | 2 +- chromium_src/chrome/browser/icon_manager.h | 2 +- .../chrome/browser/printing/print_job.h | 4 +- .../browser/printing/print_job_manager.h | 4 +- .../browser/printing/print_job_worker.h | 10 +- .../browser/printing/print_job_worker_owner.h | 5 +- .../printing/print_view_manager_base.h | 9 +- .../chrome/browser/printing/printer_query.h | 19 ++- .../printing/printing_message_filter.h | 7 +- .../chrome/browser/process_singleton.h | 2 +- .../pepper/pepper_broker_message_filter.h | 2 +- .../pepper/pepper_flash_browser_host.h | 2 +- .../pepper_flash_clipboard_message_filter.h | 2 +- .../pepper/widevine_cdm_message_filter.h | 2 +- .../chrome/browser/speech/tts_controller.h | 14 +- .../browser/speech/tts_controller_impl.h | 6 +- .../browser/speech/tts_message_filter.h | 14 +- .../chrome/browser/speech/tts_platform.h | 11 +- .../browser/ssl/security_state_tab_helper.h | 3 +- .../chrome/browser/ui/browser_dialogs.h | 2 +- .../browser/ui/views/color_chooser_aura.h | 2 +- .../frame/global_menu_bar_registrar_x11.h | 14 +- chromium_src/chrome/common/chrome_paths.h | 138 +++++++++--------- .../chrome/common/chrome_paths_internal.h | 3 +- chromium_src/chrome/common/print_messages.h | 21 +-- chromium_src/chrome/common/tts_messages.h | 48 +++--- .../chrome/common/widevine_cdm_constants.h | 2 +- .../pepper/pepper_flash_font_file_host.h | 2 +- .../renderer/pepper/pepper_flash_menu_host.h | 4 +- .../pepper/pepper_flash_renderer_host.h | 2 +- .../pepper_shared_memory_message_filter.h | 2 +- .../renderer/printing/print_web_view_helper.h | 13 +- chromium_src/chrome/renderer/tts_dispatcher.h | 9 +- .../components/pdf/renderer/pepper_pdf_host.h | 2 +- chromium_src/extensions/common/url_pattern.h | 16 +- chromium_src/library_loaders/libspeechd.h | 5 +- 38 files changed, 202 insertions(+), 231 deletions(-) diff --git a/chromium_src/chrome/browser/certificate_manager_model.h b/chromium_src/chrome/browser/certificate_manager_model.h index d1a50b1b79a0..fc166fc43eda 100644 --- a/chromium_src/chrome/browser/certificate_manager_model.h +++ b/chromium_src/chrome/browser/certificate_manager_model.h @@ -98,13 +98,11 @@ class CertificateManagerModel { // Methods used during initialization, see the comment at the top of the .cc // file for details. - static void DidGetCertDBOnUIThread( - net::NSSCertDatabase* cert_db, - bool is_user_db_available, - const CreationCallback& callback); - static void DidGetCertDBOnIOThread( - const CreationCallback& callback, - net::NSSCertDatabase* cert_db); + static void DidGetCertDBOnUIThread(net::NSSCertDatabase* cert_db, + bool is_user_db_available, + const CreationCallback& callback); + static void DidGetCertDBOnIOThread(const CreationCallback& callback, + net::NSSCertDatabase* cert_db); static void GetCertDBOnIOThread(content::ResourceContext* context, const CreationCallback& callback); diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h b/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h index c38cb1dc5289..7cf8c74bc8b4 100644 --- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h +++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h @@ -21,8 +21,9 @@ namespace extensions { // forwards its output to the base class for processing. // // This class does two things: -// 1. Intercepts media/volume keys. Uses an event tap for intercepting media keys -// (PlayPause, NextTrack, PreviousTrack) and volume keys(VolumeUp, VolumeDown, VolumeMute). +// 1. Intercepts media/volume keys. Uses an event tap for intercepting media +// keys (PlayPause, NextTrack, PreviousTrack) and volume keys(VolumeUp, +// VolumeDown, VolumeMute). // 2. Binds keyboard shortcuts (hot keys). Carbon RegisterEventHotKey API for // binding to non-media key global hot keys (eg. Command-Shift-1). class GlobalShortcutListenerMac : public GlobalShortcutListener { @@ -67,12 +68,15 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener { bool IsAnyHotKeyRegistered(); // The callback for when an event tap happens. - static CGEventRef EventTapCallback( - CGEventTapProxy proxy, CGEventType type, CGEventRef event, void* refcon); + static CGEventRef EventTapCallback(CGEventTapProxy proxy, + CGEventType type, + CGEventRef event, + void* refcon); // The callback for when a hot key event happens. - static OSStatus HotKeyHandler( - EventHandlerCallRef next_handler, EventRef event, void* user_data); + static OSStatus HotKeyHandler(EventHandlerCallRef next_handler, + EventRef event, + void* user_data); // Whether this object is listening for global shortcuts. bool is_listening_; diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h index 43230b7aa310..99f31d7f54ed 100644 --- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h +++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_ #define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_ -#include #include +#include #include diff --git a/chromium_src/chrome/browser/icon_manager.h b/chromium_src/chrome/browser/icon_manager.h index 5cda41d469b3..4f2c9ec5f07a 100644 --- a/chromium_src/chrome/browser/icon_manager.h +++ b/chromium_src/chrome/browser/icon_manager.h @@ -97,7 +97,7 @@ class IconManager { CacheKey(const IconLoader::IconGroup& group, IconLoader::IconSize size); // Used as a key in the map below, so we need this comparator. - bool operator<(const CacheKey &other) const; + bool operator<(const CacheKey& other) const; IconLoader::IconGroup group; IconLoader::IconSize size; diff --git a/chromium_src/chrome/browser/printing/print_job.h b/chromium_src/chrome/browser/printing/print_job.h index 28fc372ffd7b..9f6dad11a793 100644 --- a/chromium_src/chrome/browser/printing/print_job.h +++ b/chromium_src/chrome/browser/printing/print_job.h @@ -209,9 +209,7 @@ class JobEventDetails : public base::RefCountedThreadSafe { // Getters. PrintedDocument* document() const; PrintedPage* page() const; - Type type() const { - return type_; - } + Type type() const { return type_; } private: friend class base::RefCountedThreadSafe; diff --git a/chromium_src/chrome/browser/printing/print_job_manager.h b/chromium_src/chrome/browser/printing/print_job_manager.h index 4b170589a5b0..161a3a014244 100644 --- a/chromium_src/chrome/browser/printing/print_job_manager.h +++ b/chromium_src/chrome/browser/printing/print_job_manager.h @@ -43,7 +43,7 @@ class PrintQueriesQueue : public base::RefCountedThreadSafe { private: friend class base::RefCountedThreadSafe; - typedef std::vector > PrinterQueries; + typedef std::vector> PrinterQueries; virtual ~PrintQueriesQueue(); @@ -73,7 +73,7 @@ class PrintJobManager : public content::NotificationObserver { scoped_refptr queue(); private: - typedef std::set > PrintJobs; + typedef std::set> PrintJobs; // Processes a NOTIFY_PRINT_JOB_EVENT notification. void OnPrintJobEvent(PrintJob* print_job, diff --git a/chromium_src/chrome/browser/printing/print_job_worker.h b/chromium_src/chrome/browser/printing/print_job_worker.h index b6b144f9081d..042ee82cd0d1 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.h +++ b/chromium_src/chrome/browser/printing/print_job_worker.h @@ -77,8 +77,7 @@ class PrintJobWorker { bool IsRunning() const; // Posts the given task to be run. - bool PostTask(const base::Location& from_here, - const base::Closure& task); + bool PostTask(const base::Location& from_here, const base::Closure& task); // Signals the thread to exit in the near future. void StopSoon(); @@ -114,10 +113,9 @@ class PrintJobWorker { // Asks the user for print settings. Must be called on the UI thread. // Required on Mac and Linux. Windows can display UI from non-main threads, // but sticks with this for consistency. - void GetSettingsWithUI( - int document_page_count, - bool has_selection, - bool is_scripted); + void GetSettingsWithUI(int document_page_count, + bool has_selection, + bool is_scripted); // Called on the UI thread to update the print settings. void UpdatePrintSettings(std::unique_ptr new_settings); diff --git a/chromium_src/chrome/browser/printing/print_job_worker_owner.h b/chromium_src/chrome/browser/printing/print_job_worker_owner.h index 0e3605ea5068..cd1c9fa8905d 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker_owner.h +++ b/chromium_src/chrome/browser/printing/print_job_worker_owner.h @@ -14,7 +14,7 @@ namespace base { class MessageLoop; class SequencedTaskRunner; -} +} // namespace base namespace printing { @@ -48,8 +48,7 @@ class PrintJobWorkerOwner bool RunsTasksInCurrentSequence() const; // Posts the given task to be run. - bool PostTask(const base::Location& from_here, - const base::Closure& task); + bool PostTask(const base::Location& from_here, const base::Closure& task); protected: friend class base::RefCountedThreadSafe; diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.h b/chromium_src/chrome/browser/printing/print_view_manager_base.h index ff0a1f38fe64..669889b0e308 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.h +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.h @@ -9,8 +9,8 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "components/prefs/pref_member.h" #include "base/strings/string16.h" +#include "components/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" @@ -41,16 +41,15 @@ class PrintViewManagerBase : public content::NotificationObserver, // asynchronous, the actual printing will not be completed on the return of // this function. Returns false if printing is impossible at the moment. virtual bool PrintNow(content::RenderFrameHost* rfh, - bool silent, bool print_background, + bool silent, + bool print_background, const base::string16& device_name); #endif // !DISABLE_BASIC_PRINTING // PrintedPagesSource implementation. base::string16 RenderSourceName(); - void SetCallback(const base::Callback& cb) { - callback = cb; - }; + void SetCallback(const base::Callback& cb) { callback = cb; }; protected: explicit PrintViewManagerBase(content::WebContents* web_contents); diff --git a/chromium_src/chrome/browser/printing/printer_query.h b/chromium_src/chrome/browser/printing/printer_query.h index f150f1b278a8..2cbeca374666 100644 --- a/chromium_src/chrome/browser/printing/printer_query.h +++ b/chromium_src/chrome/browser/printing/printer_query.h @@ -53,17 +53,16 @@ class PrinterQuery : public PrintJobWorkerOwner { bool is_modifiable, const base::Closure& callback); - void GetSettings( - GetSettingsAskParam ask_user_for_settings, - int expected_page_count, - bool has_selection, - MarginType margin_type, - bool is_scripted, - bool is_modifiable, - const base::string16& device_name, - const base::Closure& callback); + void GetSettings(GetSettingsAskParam ask_user_for_settings, + int expected_page_count, + bool has_selection, + MarginType margin_type, + bool is_scripted, + bool is_modifiable, + const base::string16& device_name, + const base::Closure& callback); - // Updates the current settings with |new_settings| dictionary values. + // Updates the current settings with |new_settings| dictionary values. void SetSettings(std::unique_ptr new_settings, const base::Closure& callback); diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.h b/chromium_src/chrome/browser/printing/printing_message_filter.h index fb7dced52e4e..9a6d3c5ec570 100644 --- a/chromium_src/chrome/browser/printing/printing_message_filter.h +++ b/chromium_src/chrome/browser/printing/printing_message_filter.h @@ -15,7 +15,7 @@ struct PrintHostMsg_ScriptedPrint_Params; namespace base { class DictionaryValue; class FilePath; -} +} // namespace base namespace content { class WebContents; @@ -33,9 +33,8 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { PrintingMessageFilter(int render_process_id); // content::BrowserMessageFilter methods. - void OverrideThreadForMessage( - const IPC::Message& message, - content::BrowserThread::ID* thread) override; + void OverrideThreadForMessage(const IPC::Message& message, + content::BrowserThread::ID* thread) override; bool OnMessageReceived(const IPC::Message& message) override; private: diff --git a/chromium_src/chrome/browser/process_singleton.h b/chromium_src/chrome/browser/process_singleton.h index 3ee6ca8140fc..b2909e8d1852 100644 --- a/chromium_src/chrome/browser/process_singleton.h +++ b/chromium_src/chrome/browser/process_singleton.h @@ -127,7 +127,7 @@ class ProcessSingleton { NotificationCallback notification_callback_; // Handler for notifications. #if defined(OS_WIN) - HWND remote_window_; // The HWND_MESSAGE of another browser. + HWND remote_window_; // The HWND_MESSAGE of another browser. base::win::MessageWindow window_; // The message-only window. bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment. HANDLE lock_file_; diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h b/chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h index 44627c6a3556..2aad5593b26a 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h @@ -18,7 +18,7 @@ namespace ppapi { namespace host { struct HostMessageContext; } -} +} // namespace ppapi namespace chrome { diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h index 40a03a1ff56f..65e0d02c001c 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h @@ -17,7 +17,7 @@ class Time; namespace content { class BrowserPpapiHost; class ResourceContext; -} +} // namespace content class GURL; diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h index 4c146dd5daa0..b282d54df28c 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h +++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h @@ -15,7 +15,7 @@ namespace ppapi { namespace host { struct HostMessageContext; } -} +} // namespace ppapi namespace ui { class ScopedClipboardWriter; diff --git a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h index d1e5c2d38db4..abd38c79a2bf 100644 --- a/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h +++ b/chromium_src/chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h @@ -16,7 +16,7 @@ class BrowserContext; class WidevineCdmMessageFilter : public content::BrowserMessageFilter { public: explicit WidevineCdmMessageFilter(int render_process_id, - content::BrowserContext* browser_context); + content::BrowserContext* browser_context); bool OnMessageReceived(const IPC::Message& message) override; void OnDestruct() const override; diff --git a/chromium_src/chrome/browser/speech/tts_controller.h b/chromium_src/chrome/browser/speech/tts_controller.h index 0587a1b8cb29..b435fdb08ae2 100644 --- a/chromium_src/chrome/browser/speech/tts_controller.h +++ b/chromium_src/chrome/browser/speech/tts_controller.h @@ -40,11 +40,7 @@ enum TtsEventType { TTS_EVENT_RESUME }; -enum TtsGenderType { - TTS_GENDER_NONE, - TTS_GENDER_MALE, - TTS_GENDER_FEMALE -}; +enum TtsGenderType { TTS_GENDER_NONE, TTS_GENDER_MALE, TTS_GENDER_FEMALE }; // Returns true if this event type is one that indicates an utterance // is finished and can be destroyed. @@ -167,14 +163,10 @@ class Utterance { } const std::string& voice_name() const { return voice_name_; } - void set_lang(const std::string& lang) { - lang_ = lang; - } + void set_lang(const std::string& lang) { lang_ = lang; } const std::string& lang() const { return lang_; } - void set_gender(TtsGenderType gender) { - gender_ = gender; - } + void set_gender(TtsGenderType gender) { gender_ = gender; } TtsGenderType gender() const { return gender_; } void set_continuous_parameters(const UtteranceContinuousParameters& params) { diff --git a/chromium_src/chrome/browser/speech/tts_controller_impl.h b/chromium_src/chrome/browser/speech/tts_controller_impl.h index 749c60ad6dcf..e11cacbe41b8 100644 --- a/chromium_src/chrome/browser/speech/tts_controller_impl.h +++ b/chromium_src/chrome/browser/speech/tts_controller_impl.h @@ -35,9 +35,9 @@ class TtsControllerImpl : public TtsController { virtual void Pause() override; virtual void Resume() override; virtual void OnTtsEvent(int utterance_id, - TtsEventType event_type, - int char_index, - const std::string& error_message) override; + TtsEventType event_type, + int char_index, + const std::string& error_message) override; virtual void GetVoices(content::BrowserContext* browser_context, std::vector* out_voices) override; virtual void VoicesChanged() override; diff --git a/chromium_src/chrome/browser/speech/tts_message_filter.h b/chromium_src/chrome/browser/speech/tts_message_filter.h index b09565161190..31e009b3fcc3 100644 --- a/chromium_src/chrome/browser/speech/tts_message_filter.h +++ b/chromium_src/chrome/browser/speech/tts_message_filter.h @@ -14,18 +14,16 @@ namespace content { class BrowserContext; } -class TtsMessageFilter - : public content::BrowserMessageFilter, - public UtteranceEventDelegate, - public VoicesChangedDelegate { +class TtsMessageFilter : public content::BrowserMessageFilter, + public UtteranceEventDelegate, + public VoicesChangedDelegate { public: explicit TtsMessageFilter(int render_process_id, - content::BrowserContext* browser_context); + content::BrowserContext* browser_context); // content::BrowserMessageFilter implementation. - void OverrideThreadForMessage( - const IPC::Message& message, - content::BrowserThread::ID* thread) override; + void OverrideThreadForMessage(const IPC::Message& message, + content::BrowserThread::ID* thread) override; bool OnMessageReceived(const IPC::Message& message) override; void OnChannelClosing() override; void OnDestruct() const override; diff --git a/chromium_src/chrome/browser/speech/tts_platform.h b/chromium_src/chrome/browser/speech/tts_platform.h index f33eab1c18ad..1a39d0ba0295 100644 --- a/chromium_src/chrome/browser/speech/tts_platform.h +++ b/chromium_src/chrome/browser/speech/tts_platform.h @@ -33,12 +33,11 @@ class TtsPlatformImpl { // The TtsController will only try to speak one utterance at // a time. If it wants to interrupt speech, it will always call Stop // before speaking again. - virtual bool Speak( - int utterance_id, - const std::string& utterance, - const std::string& lang, - const VoiceData& voice, - const UtteranceContinuousParameters& params) = 0; + virtual bool Speak(int utterance_id, + const std::string& utterance, + const std::string& lang, + const VoiceData& voice, + const UtteranceContinuousParameters& params) = 0; // Stop speaking immediately and return true on success. virtual bool StopSpeaking() = 0; diff --git a/chromium_src/chrome/browser/ssl/security_state_tab_helper.h b/chromium_src/chrome/browser/ssl/security_state_tab_helper.h index 13b256737c6e..2fcb9ffbd1c2 100644 --- a/chromium_src/chrome/browser/ssl/security_state_tab_helper.h +++ b/chromium_src/chrome/browser/ssl/security_state_tab_helper.h @@ -27,8 +27,7 @@ class SecurityStateTabHelper ~SecurityStateTabHelper() override; // See security_state::GetSecurityInfo. - void GetSecurityInfo( - security_state::SecurityInfo* result) const; + void GetSecurityInfo(security_state::SecurityInfo* result) const; // Called when the NavigationEntry's SSLStatus or other security // information changes. diff --git a/chromium_src/chrome/browser/ui/browser_dialogs.h b/chromium_src/chrome/browser/ui/browser_dialogs.h index 76d6e00a4fa4..f6554d4465a1 100644 --- a/chromium_src/chrome/browser/ui/browser_dialogs.h +++ b/chromium_src/chrome/browser/ui/browser_dialogs.h @@ -13,7 +13,7 @@ class SkBitmap; namespace content { class ColorChooser; class WebContents; -} +} // namespace content namespace chrome { diff --git a/chromium_src/chrome/browser/ui/views/color_chooser_aura.h b/chromium_src/chrome/browser/ui/views/color_chooser_aura.h index 355f540b19d5..5de7448ed22c 100644 --- a/chromium_src/chrome/browser/ui/views/color_chooser_aura.h +++ b/chromium_src/chrome/browser/ui/views/color_chooser_aura.h @@ -16,7 +16,7 @@ class WebContents; namespace views { class ColorChooserView; class Widget; -} +} // namespace views // TODO(mukai): rename this as -Ash and move to c/b/ui/ash after Linux-aura // switches to its native color chooser. diff --git a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h index 95a08b229f47..8ffb6a3e8b11 100644 --- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h +++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h @@ -36,10 +36,16 @@ class GlobalMenuBarRegistrarX11 { void RegisterXID(unsigned long xid); void UnregisterXID(unsigned long xid); - CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11, void, OnProxyCreated, - GObject*, GAsyncResult*); - CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11, void, OnNameOwnerChanged, - GObject*, GParamSpec*); + CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11, + void, + OnProxyCreated, + GObject*, + GAsyncResult*); + CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11, + void, + OnNameOwnerChanged, + GObject*, + GParamSpec*); GDBusProxy* registrar_proxy_; diff --git a/chromium_src/chrome/common/chrome_paths.h b/chromium_src/chrome/common/chrome_paths.h index 581fdc06f7c1..c38e25293572 100644 --- a/chromium_src/chrome/common/chrome_paths.h +++ b/chromium_src/chrome/common/chrome_paths.h @@ -19,36 +19,36 @@ namespace chrome { enum { PATH_START = 1000, - DIR_APP = PATH_START, // Directory where dlls and data reside. - DIR_LOGS, // Directory where logs should be written. - DIR_USER_DATA, // Directory where user data can be written. - DIR_CRASH_DUMPS, // Directory where crash dumps are written. + DIR_APP = PATH_START, // Directory where dlls and data reside. + DIR_LOGS, // Directory where logs should be written. + DIR_USER_DATA, // Directory where user data can be written. + DIR_CRASH_DUMPS, // Directory where crash dumps are written. #if defined(OS_WIN) - DIR_WATCHER_DATA, // Directory where the Chrome watcher stores - // data. + DIR_WATCHER_DATA, // Directory where the Chrome watcher stores + // data. #endif - DIR_RESOURCES, // Directory containing separate file resources - // used by Chrome at runtime. - DIR_INSPECTOR, // Directory where web inspector is located. - DIR_APP_DICTIONARIES, // Directory where the global dictionaries are. - DIR_USER_DOCUMENTS, // Directory for a user's "My Documents". - DIR_USER_MUSIC, // Directory for a user's music. - DIR_USER_PICTURES, // Directory for a user's pictures. - DIR_USER_VIDEOS, // Directory for a user's videos. - DIR_DEFAULT_DOWNLOADS_SAFE, // Directory for a user's - // "My Documents/Downloads", (Windows) or - // "Downloads". (Linux) - DIR_DEFAULT_DOWNLOADS, // Directory for a user's downloads. - DIR_INTERNAL_PLUGINS, // Directory where internal plugins reside. + DIR_RESOURCES, // Directory containing separate file resources + // used by Chrome at runtime. + DIR_INSPECTOR, // Directory where web inspector is located. + DIR_APP_DICTIONARIES, // Directory where the global dictionaries are. + DIR_USER_DOCUMENTS, // Directory for a user's "My Documents". + DIR_USER_MUSIC, // Directory for a user's music. + DIR_USER_PICTURES, // Directory for a user's pictures. + DIR_USER_VIDEOS, // Directory for a user's videos. + DIR_DEFAULT_DOWNLOADS_SAFE, // Directory for a user's + // "My Documents/Downloads", (Windows) or + // "Downloads". (Linux) + DIR_DEFAULT_DOWNLOADS, // Directory for a user's downloads. + DIR_INTERNAL_PLUGINS, // Directory where internal plugins reside. #if defined(OS_POSIX) && !defined(OS_MACOSX) - DIR_POLICY_FILES, // Directory for system-wide read-only - // policy files that allow sys-admins - // to set policies for chrome. This directory - // contains subdirectories. + DIR_POLICY_FILES, // Directory for system-wide read-only + // policy files that allow sys-admins + // to set policies for chrome. This directory + // contains subdirectories. #endif #if defined(OS_MACOSX) && !defined(OS_IOS) - DIR_USER_APPLICATIONS, // ~/Applications - DIR_USER_LIBRARY, // ~/Library + DIR_USER_APPLICATIONS, // ~/Applications + DIR_USER_LIBRARY, // ~/Library #endif #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ (defined(OS_MACOSX) && !defined(OS_IOS)) @@ -65,47 +65,47 @@ enum { // describe extensions which are to be // installed when chrome is run. #endif - DIR_EXTERNAL_EXTENSIONS, // Directory where installer places .crx files. + DIR_EXTERNAL_EXTENSIONS, // Directory where installer places .crx files. - DIR_DEFAULT_APPS, // Directory where installer places .crx files - // to be installed when chrome is first run. - DIR_PEPPER_FLASH_PLUGIN, // Directory to the bundled Pepper Flash plugin, - // containing the plugin and the manifest. + DIR_DEFAULT_APPS, // Directory where installer places .crx files + // to be installed when chrome is first run. + DIR_PEPPER_FLASH_PLUGIN, // Directory to the bundled Pepper Flash plugin, + // containing the plugin and the manifest. DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, // Base directory of the Pepper // Flash plugins downloaded by the // component updater. - FILE_RESOURCE_MODULE, // Full path and filename of the module that - // contains embedded resources (version, - // strings, images, etc.). - FILE_LOCAL_STATE, // Path and filename to the file in which - // machine/installation-specific state is saved. - FILE_RECORDED_SCRIPT, // Full path to the script.log file that - // contains recorded browser events for - // playback. - FILE_PEPPER_FLASH_PLUGIN, // Full path to the bundled Pepper Flash plugin - // file. + FILE_RESOURCE_MODULE, // Full path and filename of the module that + // contains embedded resources (version, + // strings, images, etc.). + FILE_LOCAL_STATE, // Path and filename to the file in which + // machine/installation-specific state is saved. + FILE_RECORDED_SCRIPT, // Full path to the script.log file that + // contains recorded browser events for + // playback. + FILE_PEPPER_FLASH_PLUGIN, // Full path to the bundled Pepper Flash plugin + // file. FILE_PEPPER_FLASH_SYSTEM_PLUGIN, // Full path to the system version of the // Pepper Flash plugin, downloadable from // Adobe website. Querying this path might // succeed no matter the file exists or not. - FILE_FLASH_SYSTEM_PLUGIN, // Full path to the system version of NPAPI - // Flash plugin, downloadable from Adobe - // website. Querying this path might succeed no - // matter the file exists or not. - FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file. - DIR_PNACL_BASE, // Full path to the base dir for PNaCl. - DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version - // (subdir of DIR_PNACL_BASE). - DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated - // Widevine CDM files. - FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file. - FILE_RESOURCES_PACK, // Full path to the .pak file containing - // binary data (e.g., html files and images - // used by internal pages). - DIR_RESOURCES_EXTENSION, // Full path to extension resources. + FILE_FLASH_SYSTEM_PLUGIN, // Full path to the system version of NPAPI + // Flash plugin, downloadable from Adobe + // website. Querying this path might succeed no + // matter the file exists or not. + FILE_NACL_PLUGIN, // Full path to the internal NaCl plugin file. + DIR_PNACL_BASE, // Full path to the base dir for PNaCl. + DIR_PNACL_COMPONENT, // Full path to the latest PNaCl version + // (subdir of DIR_PNACL_BASE). + DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated + // Widevine CDM files. + FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file. + FILE_RESOURCES_PACK, // Full path to the .pak file containing + // binary data (e.g., html files and images + // used by internal pages). + DIR_RESOURCES_EXTENSION, // Full path to extension resources. #if defined(OS_CHROMEOS) - DIR_CHROMEOS_WALLPAPERS, // Directory where downloaded chromeos - // wallpapers reside. + DIR_CHROMEOS_WALLPAPERS, // Directory where downloaded chromeos + // wallpapers reside. DIR_CHROMEOS_WALLPAPER_THUMBNAILS, // Directory where downloaded chromeos // wallpaper thumbnails reside. DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers @@ -118,24 +118,24 @@ enum { // supervised user whitelists are // installed. #if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) - DIR_NATIVE_MESSAGING, // System directory where native messaging host - // manifest files are stored. - DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts - // installed per-user. + DIR_NATIVE_MESSAGING, // System directory where native messaging host + // manifest files are stored. + DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts + // installed per-user. #endif #if !defined(OS_ANDROID) - DIR_GLOBAL_GCM_STORE, // Directory where the global GCM instance - // stores its data. + DIR_GLOBAL_GCM_STORE, // Directory where the global GCM instance + // stores its data. #endif // Valid only in development environment; TODO(darin): move these - DIR_GEN_TEST_DATA, // Directory where generated test data resides. - DIR_TEST_DATA, // Directory where unit test data resides. - DIR_TEST_TOOLS, // Directory where unit test tools reside. + DIR_GEN_TEST_DATA, // Directory where generated test data resides. + DIR_TEST_DATA, // Directory where unit test data resides. + DIR_TEST_TOOLS, // Directory where unit test tools reside. #if defined(OS_LINUX) - FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to - // the component updated flash plugin. -#endif // defined(OS_LINUX) + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. +#endif // defined(OS_LINUX) PATH_END }; diff --git a/chromium_src/chrome/common/chrome_paths_internal.h b/chromium_src/chrome/common/chrome_paths_internal.h index ae1cd623d773..33baa5d2ff75 100644 --- a/chromium_src/chrome/common/chrome_paths_internal.h +++ b/chromium_src/chrome/common/chrome_paths_internal.h @@ -34,7 +34,8 @@ bool GetDefaultUserDataDirectory(base::FilePath* result); // of this directory, with names like "Cache" and "Media Cache". // This will always fill in |result| with a directory, sometimes // just |profile_dir|. -void GetUserCacheDirectory(const base::FilePath& profile_dir, base::FilePath* result); +void GetUserCacheDirectory(const base::FilePath& profile_dir, + base::FilePath* result); // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/chromium_src/chrome/common/print_messages.h b/chromium_src/chrome/common/print_messages.h index 93984782e772..88837efbe3ec 100644 --- a/chromium_src/chrome/common/print_messages.h +++ b/chromium_src/chrome/common/print_messages.h @@ -14,8 +14,8 @@ #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" #include "third_party/WebKit/public/web/WebPrintScalingOption.h" -#include "ui/gfx/native_widget_types.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/native_widget_types.h" #if defined(OS_WIN) #include "ipc/ipc_platform_file.h" @@ -71,8 +71,7 @@ struct PrintMsg_PrintPages_Params { #define IPC_MESSAGE_START PrintMsgStart -IPC_ENUM_TRAITS_MAX_VALUE(printing::MarginType, - printing::MARGIN_TYPE_LAST) +IPC_ENUM_TRAITS_MAX_VALUE(printing::MarginType, printing::MARGIN_TYPE_LAST) IPC_ENUM_TRAITS_MIN_MAX_VALUE(printing::DuplexMode, printing::UNKNOWN_DUPLEX_MODE, printing::SHORT_EDGE) @@ -224,7 +223,6 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidPreviewDocument_Params) IPC_STRUCT_MEMBER(int, preview_request_id) IPC_STRUCT_END() - // Messages sent from the browser to the renderer. // Tells the render view to switch the CSS to print media type, renders every @@ -235,14 +233,12 @@ IPC_MESSAGE_ROUTED3(PrintMsg_PrintPages, base::string16 /* device name*/) // Tells the render view that printing is done so it can clean up. -IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone, - bool /* success */) +IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone, bool /* success */) // Tells the render view to switch the CSS to print media type, renders every // requested pages for print preview using the given |settings|. This gets // called multiple times as the user updates settings. -IPC_MESSAGE_ROUTED1(PrintMsg_PrintPreview, - base::DictionaryValue /* settings */) +IPC_MESSAGE_ROUTED1(PrintMsg_PrintPreview, base::DictionaryValue /* settings */) // Messages sent from the renderer to the browser. @@ -279,8 +275,8 @@ IPC_SYNC_MESSAGE_ROUTED0_1(PrintHostMsg_GetDefaultPrintSettings, // you can set the printer IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_InitSettingWithDeviceName, - base::string16, /* device name */ - PrintMsg_Print_Params /* default_settings */) + base::string16, /* device name */ + PrintMsg_Print_Params /* default_settings */) // The renderer wants to update the current print settings with new // |job_settings|. @@ -297,14 +293,13 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PrintHostMsg_UpdatePrintSettings, IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_ScriptedPrint, PrintHostMsg_ScriptedPrint_Params, PrintMsg_PrintPages_Params - /* settings chosen by the user*/) + /* settings chosen by the user*/) // This is sent when there are invalid printer settings. IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError) // Tell the browser printing failed. -IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed, - int /* document cookie */) +IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed, int /* document cookie */) // Sends back to the browser the complete rendered document (non-draft mode, // used for printing) that was requested by a PrintMsg_PrintPreview message. diff --git a/chromium_src/chrome/common/tts_messages.h b/chromium_src/chrome/common/tts_messages.h index 2132d80a0775..f4f20172fbf7 100644 --- a/chromium_src/chrome/common/tts_messages.h +++ b/chromium_src/chrome/common/tts_messages.h @@ -13,44 +13,38 @@ #define IPC_MESSAGE_START TtsMsgStart IPC_STRUCT_TRAITS_BEGIN(TtsUtteranceRequest) -IPC_STRUCT_TRAITS_MEMBER(id) -IPC_STRUCT_TRAITS_MEMBER(text) -IPC_STRUCT_TRAITS_MEMBER(lang) -IPC_STRUCT_TRAITS_MEMBER(voice) -IPC_STRUCT_TRAITS_MEMBER(volume) -IPC_STRUCT_TRAITS_MEMBER(rate) -IPC_STRUCT_TRAITS_MEMBER(pitch) + IPC_STRUCT_TRAITS_MEMBER(id) + IPC_STRUCT_TRAITS_MEMBER(text) + IPC_STRUCT_TRAITS_MEMBER(lang) + IPC_STRUCT_TRAITS_MEMBER(voice) + IPC_STRUCT_TRAITS_MEMBER(volume) + IPC_STRUCT_TRAITS_MEMBER(rate) + IPC_STRUCT_TRAITS_MEMBER(pitch) IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(TtsVoice) -IPC_STRUCT_TRAITS_MEMBER(voice_uri) -IPC_STRUCT_TRAITS_MEMBER(name) -IPC_STRUCT_TRAITS_MEMBER(lang) -IPC_STRUCT_TRAITS_MEMBER(local_service) -IPC_STRUCT_TRAITS_MEMBER(is_default) + IPC_STRUCT_TRAITS_MEMBER(voice_uri) + IPC_STRUCT_TRAITS_MEMBER(name) + IPC_STRUCT_TRAITS_MEMBER(lang) + IPC_STRUCT_TRAITS_MEMBER(local_service) + IPC_STRUCT_TRAITS_MEMBER(is_default) IPC_STRUCT_TRAITS_END() // Renderer -> Browser messages. IPC_MESSAGE_CONTROL0(TtsHostMsg_InitializeVoiceList) -IPC_MESSAGE_CONTROL1(TtsHostMsg_Speak, - TtsUtteranceRequest) +IPC_MESSAGE_CONTROL1(TtsHostMsg_Speak, TtsUtteranceRequest) IPC_MESSAGE_CONTROL0(TtsHostMsg_Pause) IPC_MESSAGE_CONTROL0(TtsHostMsg_Resume) IPC_MESSAGE_CONTROL0(TtsHostMsg_Cancel) // Browser -> Renderer messages. -IPC_MESSAGE_CONTROL1(TtsMsg_SetVoiceList, - std::vector) -IPC_MESSAGE_CONTROL1(TtsMsg_DidStartSpeaking, - int /* utterance id */) -IPC_MESSAGE_CONTROL1(TtsMsg_DidFinishSpeaking, - int /* utterance id */) -IPC_MESSAGE_CONTROL1(TtsMsg_DidPauseSpeaking, - int /* utterance id */) -IPC_MESSAGE_CONTROL1(TtsMsg_DidResumeSpeaking, - int /* utterance id */) +IPC_MESSAGE_CONTROL1(TtsMsg_SetVoiceList, std::vector) +IPC_MESSAGE_CONTROL1(TtsMsg_DidStartSpeaking, int /* utterance id */) +IPC_MESSAGE_CONTROL1(TtsMsg_DidFinishSpeaking, int /* utterance id */) +IPC_MESSAGE_CONTROL1(TtsMsg_DidPauseSpeaking, int /* utterance id */) +IPC_MESSAGE_CONTROL1(TtsMsg_DidResumeSpeaking, int /* utterance id */) IPC_MESSAGE_CONTROL2(TtsMsg_WordBoundary, int /* utterance id */, int /* char index */) @@ -60,10 +54,8 @@ IPC_MESSAGE_CONTROL2(TtsMsg_SentenceBoundary, IPC_MESSAGE_CONTROL2(TtsMsg_MarkerEvent, int /* utterance id */, int /* char index */) -IPC_MESSAGE_CONTROL1(TtsMsg_WasInterrupted, - int /* utterance id */) -IPC_MESSAGE_CONTROL1(TtsMsg_WasCancelled, - int /* utterance id */) +IPC_MESSAGE_CONTROL1(TtsMsg_WasInterrupted, int /* utterance id */) +IPC_MESSAGE_CONTROL1(TtsMsg_WasCancelled, int /* utterance id */) IPC_MESSAGE_CONTROL2(TtsMsg_SpeakingErrorOccurred, int /* utterance id */, std::string /* error message */) \ No newline at end of file diff --git a/chromium_src/chrome/common/widevine_cdm_constants.h b/chromium_src/chrome/common/widevine_cdm_constants.h index 020601d236dc..babb61e5ef79 100644 --- a/chromium_src/chrome/common/widevine_cdm_constants.h +++ b/chromium_src/chrome/common/widevine_cdm_constants.h @@ -5,8 +5,8 @@ #ifndef CHROME_COMMON_WIDEVINE_CDM_CONSTANTS_H_ #define CHROME_COMMON_WIDEVINE_CDM_CONSTANTS_H_ -#include "base/macros.h" #include "base/files/file_path.h" +#include "base/macros.h" extern const char kWidevineCdmPluginExtension[]; diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h b/chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h index 0205a69b503b..15eb73837b50 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -23,7 +23,7 @@ namespace ppapi { namespace proxy { struct SerializedFontDescription; } -} +} // namespace ppapi class PepperFlashFontFileHost : public ppapi::host::ResourceHost { public: diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h b/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h index 3aa730a6afc3..a2b4f9cb4009 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_menu_host.h @@ -16,13 +16,13 @@ namespace content { class RendererPpapiHost; struct MenuItem; -} +} // namespace content namespace ppapi { namespace proxy { class SerializedFlashMenu; } -} +} // namespace ppapi class PepperFlashMenuHost : public ppapi::host::ResourceHost, public content::ContextMenuClient { diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h index f37907a8655e..b080f1d9fbf0 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h +++ b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.h @@ -22,7 +22,7 @@ namespace ppapi { namespace proxy { struct PPBFlash_DrawGlyphs_Params; } -} +} // namespace ppapi namespace content { class RendererPpapiHost; diff --git a/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h b/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h index 860e1c9dbd15..d1e2dc1719e5 100644 --- a/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h +++ b/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h @@ -16,7 +16,7 @@ namespace ppapi { namespace proxy { class SerializedHandle; } -} +} // namespace ppapi // Implements the backend for shared memory messages from a plugin process. class PepperSharedMemoryMessageFilter diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.h b/chromium_src/chrome/renderer/printing/print_web_view_helper.h index bb2b36f40c06..94e16eaabf45 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper.h +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.h @@ -106,7 +106,6 @@ class PrintWebViewHelper #endif // !DISABLE_BASIC_PRINTING void OnPrintPreview(const base::DictionaryValue& settings); - // Get |page_size| and |content_area| information from // |page_layout_in_points|. void GetPageSizeAndContentAreaFromPageLayout( @@ -131,7 +130,6 @@ class PrintWebViewHelper bool RenderPreviewPage(int page_number, const PrintMsg_Print_Params& print_params); - // Initialize the print preview document. bool CreatePreviewDocument(); @@ -154,10 +152,11 @@ class PrintWebViewHelper const base::string16& device_name = base::string16()); // Calculate number of pages in source document. - bool CalculateNumberOfPages(blink::WebLocalFrame* frame, - const blink::WebNode& node, - int* number_of_pages, - const base::string16& device_name = base::string16()); + bool CalculateNumberOfPages( + blink::WebLocalFrame* frame, + const blink::WebNode& node, + int* number_of_pages, + const base::string16& device_name = base::string16()); // Update the current print settings with new |passed_job_settings|. // |passed_job_settings| dictionary contains print job details such as printer @@ -166,7 +165,6 @@ class PrintWebViewHelper const blink::WebNode& node, const base::DictionaryValue& passed_job_settings); - // Get final print settings from the user. // Return false if the user cancels or on error. bool GetPrintSettingsFromUser(blink::WebLocalFrame* frame, @@ -373,7 +371,6 @@ class PrintWebViewHelper State state_; }; - bool print_node_in_progress_; bool is_loading_; bool is_scripted_preview_delayed_; diff --git a/chromium_src/chrome/renderer/tts_dispatcher.h b/chromium_src/chrome/renderer/tts_dispatcher.h index df31d88d4ee8..2e5e6062fd1e 100644 --- a/chromium_src/chrome/renderer/tts_dispatcher.h +++ b/chromium_src/chrome/renderer/tts_dispatcher.h @@ -25,9 +25,8 @@ struct TtsVoice; // itself when deleted. There can be multiple TtsDispatchers alive at once, // so each one routes IPC messages to its WebSpeechSynthesizerClient only if // the utterance id (which is globally unique) matches. -class TtsDispatcher - : public blink::WebSpeechSynthesizer, - public content::RenderThreadObserver { +class TtsDispatcher : public blink::WebSpeechSynthesizer, + public content::RenderThreadObserver { public: explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client); virtual ~TtsDispatcher(); @@ -38,8 +37,8 @@ class TtsDispatcher // blink::WebSpeechSynthesizer implementation. virtual void UpdateVoiceList() override; - virtual void Speak(const blink::WebSpeechSynthesisUtterance& utterance) - override; + virtual void Speak( + const blink::WebSpeechSynthesisUtterance& utterance) override; virtual void Pause() override; virtual void Resume() override; virtual void Cancel() override; diff --git a/chromium_src/components/pdf/renderer/pepper_pdf_host.h b/chromium_src/components/pdf/renderer/pepper_pdf_host.h index 0f92ad40dbce..78b12dbb109c 100644 --- a/chromium_src/components/pdf/renderer/pepper_pdf_host.h +++ b/chromium_src/components/pdf/renderer/pepper_pdf_host.h @@ -17,7 +17,7 @@ namespace content { class RenderFrame; class RendererPpapiHost; -} +} // namespace content namespace pdf { diff --git a/chromium_src/extensions/common/url_pattern.h b/chromium_src/extensions/common/url_pattern.h index d844a1baa4a0..9091b00d2f3b 100644 --- a/chromium_src/extensions/common/url_pattern.h +++ b/chromium_src/extensions/common/url_pattern.h @@ -47,13 +47,13 @@ class URLPattern { public: // A collection of scheme bitmasks for use with valid_schemes. enum SchemeMasks { - SCHEME_NONE = 0, - SCHEME_HTTP = 1 << 0, - SCHEME_HTTPS = 1 << 1, - SCHEME_FILE = 1 << 2, - SCHEME_FTP = 1 << 3, - SCHEME_CHROMEUI = 1 << 4, - SCHEME_EXTENSION = 1 << 5, + SCHEME_NONE = 0, + SCHEME_HTTP = 1 << 0, + SCHEME_HTTPS = 1 << 1, + SCHEME_FILE = 1 << 2, + SCHEME_FTP = 1 << 3, + SCHEME_CHROMEUI = 1 << 4, + SCHEME_EXTENSION = 1 << 5, SCHEME_FILESYSTEM = 1 << 6, // IMPORTANT! @@ -62,7 +62,7 @@ class URLPattern { // implications, third-party extensions should usually not be able to get // access to URL patterns initialized this way. If there is a reason // for violating this general rule, document why this it safe. - SCHEME_ALL = -1, + SCHEME_ALL = -1, }; // Error codes returned from Parse(). diff --git a/chromium_src/library_loaders/libspeechd.h b/chromium_src/library_loaders/libspeechd.h index f7b276287a41..a5dfe7331085 100644 --- a/chromium_src/library_loaders/libspeechd.h +++ b/chromium_src/library_loaders/libspeechd.h @@ -1,5 +1,6 @@ // This is generated file. Do not modify directly. -// Path to the code generator: tools/generate_library_loader/generate_library_loader.py . +// Path to the code generator: +// tools/generate_library_loader/generate_library_loader.py . #ifndef LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H #define LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H @@ -7,7 +8,6 @@ #include "third_party/speech-dispatcher/libspeechd.h" #define LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBSPEECHD_H_DLOPEN - #include class LibSpeechdLoader { @@ -35,7 +35,6 @@ class LibSpeechdLoader { decltype(&::spd_set_output_module) spd_set_output_module; decltype(&::spd_set_language) spd_set_language; - private: void CleanUp(bool unload);