mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scoped_ptr.PassAs is removed

Browse source
This commit is contained in:
Cheng Zhao 2015-01-09 17:42:48 -08:00
parent 43421aedcf
commit 5c78ecfe40
21 changed files with 84 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/atom_browser_context.cc
View file

@ -68,8 +68,7 @@ net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory(
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))); base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
// Set up interceptors in the reverse order. // Set up interceptors in the reverse order.
scoped_ptr<net::URLRequestJobFactory> top_job_factory = scoped_ptr<net::URLRequestJobFactory> top_job_factory = job_factory.Pass();
job_factory.PassAs<net::URLRequestJobFactory>();
content::URLRequestInterceptorScopedVector::reverse_iterator it; content::URLRequestInterceptorScopedVector::reverse_iterator it;
for (it = interceptors->rbegin(); it != interceptors->rend(); ++it) for (it = interceptors->rbegin(); it != interceptors->rend(); ++it)
top_job_factory.reset(new net::URLRequestInterceptingJobFactory( top_job_factory.reset(new net::URLRequestInterceptingJobFactory(

8
chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h
View file

@ -41,12 +41,12 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener {
bool OnMediaOrVolumeKeyEvent(int key_code); bool OnMediaOrVolumeKeyEvent(int key_code);
// GlobalShortcutListener implementation. // GlobalShortcutListener implementation.
virtual void StartListening() OVERRIDE; virtual void StartListening() override;
virtual void StopListening() OVERRIDE; virtual void StopListening() override;
virtual bool RegisterAcceleratorImpl( virtual bool RegisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE; const ui::Accelerator& accelerator) override;
virtual void UnregisterAcceleratorImpl( virtual void UnregisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE; const ui::Accelerator& accelerator) override;
// Mac-specific functions for registering hot keys with modifiers. // Mac-specific functions for registering hot keys with modifiers.
bool RegisterHotKey(const ui::Accelerator& accelerator, KeyId hot_key_id); bool RegisterHotKey(const ui::Accelerator& accelerator, KeyId hot_key_id);

10
chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
View file

@ -26,15 +26,15 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener,
virtual void OnWndProc(HWND hwnd, virtual void OnWndProc(HWND hwnd,
UINT message, UINT message,
WPARAM wparam, WPARAM wparam,
LPARAM lparam) OVERRIDE; LPARAM lparam) override;
// GlobalShortcutListener implementation. // GlobalShortcutListener implementation.
virtual void StartListening() OVERRIDE; virtual void StartListening() override;
virtual void StopListening() OVERRIDE; virtual void StopListening() override;
virtual bool RegisterAcceleratorImpl( virtual bool RegisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE; const ui::Accelerator& accelerator) override;
virtual void UnregisterAcceleratorImpl( virtual void UnregisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE; const ui::Accelerator& accelerator) override;
// Whether this object is listening for global shortcuts. // Whether this object is listening for global shortcuts.
bool is_listening_; bool is_listening_;

12
chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h
View file

@ -23,17 +23,17 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener,
virtual ~GlobalShortcutListenerX11(); virtual ~GlobalShortcutListenerX11();
// ui::PlatformEventDispatcher implementation. // ui::PlatformEventDispatcher implementation.
virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
private: private:
// GlobalShortcutListener implementation. // GlobalShortcutListener implementation.
virtual void StartListening() OVERRIDE; virtual void StartListening() override;
virtual void StopListening() OVERRIDE; virtual void StopListening() override;
virtual bool RegisterAcceleratorImpl( virtual bool RegisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE; const ui::Accelerator& accelerator) override;
virtual void UnregisterAcceleratorImpl( virtual void UnregisterAcceleratorImpl(
const ui::Accelerator& accelerator) OVERRIDE; const ui::Accelerator& accelerator) override;
// Invoked when a global shortcut is pressed. // Invoked when a global shortcut is pressed.
void OnXKeyPressEvent(::XEvent* x_event); void OnXKeyPressEvent(::XEvent* x_event);

10
chromium_src/chrome/browser/printing/print_job.h
View file

@ -51,14 +51,14 @@ class PrintJob : public PrintJobWorkerOwner,
// content::NotificationObserver implementation. // content::NotificationObserver implementation.
virtual void Observe(int type, virtual void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE; const content::NotificationDetails& details) override;
// PrintJobWorkerOwner implementation. // PrintJobWorkerOwner implementation.
virtual void GetSettingsDone(const PrintSettings& new_settings, virtual void GetSettingsDone(const PrintSettings& new_settings,
PrintingContext::Result result) OVERRIDE; PrintingContext::Result result) override;
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE; virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override;
virtual const PrintSettings& settings() const OVERRIDE; virtual const PrintSettings& settings() const override;
virtual int cookie() const OVERRIDE; virtual int cookie() const override;
// Starts the actual printing. Signals the worker that it should begin to // Starts the actual printing. Signals the worker that it should begin to
// spool as soon as data is available. // spool as soon as data is available.

2
chromium_src/chrome/browser/printing/print_job_manager.h
View file

@ -66,7 +66,7 @@ class PrintJobManager : public content::NotificationObserver {
// content::NotificationObserver // content::NotificationObserver
virtual void Observe(int type, virtual void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE; const content::NotificationDetails& details) override;
// Returns queries queue. Never returns NULL. Must be called on Browser UI // Returns queries queue. Never returns NULL. Must be called on Browser UI
// Thread. Reference could be stored and used from any thread. // Thread. Reference could be stored and used from any thread.

4
chromium_src/chrome/browser/printing/print_job_worker.cc
View file

@ -40,8 +40,8 @@ class PrintingContextDelegate : public PrintingContext::Delegate {
PrintingContextDelegate(int render_process_id, int render_view_id); PrintingContextDelegate(int render_process_id, int render_view_id);
virtual ~PrintingContextDelegate(); virtual ~PrintingContextDelegate();
virtual gfx::NativeView GetParentView() OVERRIDE; virtual gfx::NativeView GetParentView() override;
virtual std::string GetAppLocale() OVERRIDE; virtual std::string GetAppLocale() override;
private: private:
int render_process_id_; int render_process_id_;

2
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -144,7 +144,7 @@ void PrintViewManagerBase::OnDidPrintPage(
#if !defined(OS_WIN) #if !defined(OS_WIN)
// Update the rendered document. It will send notifications to the listener. // Update the rendered document. It will send notifications to the listener.
document->SetPage(params.page_number, document->SetPage(params.page_number,
metafile.PassAs<MetafilePlayer>(), metafile.Pass(),
params.page_size, params.page_size,
params.content_area); params.content_area);

10
chromium_src/chrome/browser/printing/print_view_manager_base.h
View file

@ -43,7 +43,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
#endif // !DISABLE_BASIC_PRINTING #endif // !DISABLE_BASIC_PRINTING
// PrintedPagesSource implementation. // PrintedPagesSource implementation.
virtual base::string16 RenderSourceName() OVERRIDE; virtual base::string16 RenderSourceName() override;
protected: protected:
explicit PrintViewManagerBase(content::WebContents* web_contents); explicit PrintViewManagerBase(content::WebContents* web_contents);
@ -52,10 +52,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
bool PrintNowInternal(IPC::Message* message); bool PrintNowInternal(IPC::Message* message);
// Terminates or cancels the print job if one was pending. // Terminates or cancels the print job if one was pending.
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; virtual void RenderProcessGone(base::TerminationStatus status) override;
// content::WebContentsObserver implementation. // content::WebContentsObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) override;
// IPC Message handlers. // IPC Message handlers.
virtual void OnPrintingFailed(int cookie); virtual void OnPrintingFailed(int cookie);
@ -64,10 +64,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
// content::NotificationObserver implementation. // content::NotificationObserver implementation.
virtual void Observe(int type, virtual void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE; const content::NotificationDetails& details) override;
// Cancels the print job. // Cancels the print job.
virtual void NavigationStopped() OVERRIDE; virtual void NavigationStopped() override;
// IPC Message handlers. // IPC Message handlers.
void OnDidGetPrintedPagesCount(int cookie, int number_pages); void OnDidGetPrintedPagesCount(int cookie, int number_pages);

6
chromium_src/chrome/browser/printing/print_view_manager_basic.h
View file

@ -32,10 +32,10 @@ class PrintViewManagerBasic
// content::WebContentsObserver implementation. // content::WebContentsObserver implementation.
// Terminates or cancels the print job if one was pending. // Terminates or cancels the print job if one was pending.
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; virtual void RenderProcessGone(base::TerminationStatus status) override;
// content::WebContentsObserver implementation. // content::WebContentsObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) override;
#endif #endif
private: private:
@ -43,7 +43,7 @@ class PrintViewManagerBasic
friend class content::WebContentsUserData<PrintViewManagerBasic>; friend class content::WebContentsUserData<PrintViewManagerBasic>;
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
virtual void OnPrintingFailed(int cookie) OVERRIDE; virtual void OnPrintingFailed(int cookie) override;
// The file descriptor into which the PDF of the page will be written. // The file descriptor into which the PDF of the page will be written.
base::FileDescriptor file_descriptor_; base::FileDescriptor file_descriptor_;

8
chromium_src/chrome/browser/printing/printer_query.h
View file

@ -33,10 +33,10 @@ class PrinterQuery : public PrintJobWorkerOwner {
// PrintJobWorkerOwner implementation. // PrintJobWorkerOwner implementation.
virtual void GetSettingsDone(const PrintSettings& new_settings, virtual void GetSettingsDone(const PrintSettings& new_settings,
PrintingContext::Result result) OVERRIDE; PrintingContext::Result result) override;
virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE; virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override;
virtual const PrintSettings& settings() const OVERRIDE; virtual const PrintSettings& settings() const override;
virtual int cookie() const OVERRIDE; virtual int cookie() const override;
// Initializes the printing context. It is fine to call this function multiple // Initializes the printing context. It is fine to call this function multiple
// times to reinitialize the settings. |web_contents_observer| can be queried // times to reinitialize the settings. |web_contents_observer| can be queried

28
chromium_src/chrome/browser/speech/tts_controller_impl.h
View file

@ -29,26 +29,26 @@ class TtsControllerImpl : public TtsController {
static TtsControllerImpl* GetInstance(); static TtsControllerImpl* GetInstance();
// TtsController methods // TtsController methods
virtual bool IsSpeaking() OVERRIDE; virtual bool IsSpeaking() override;
virtual void SpeakOrEnqueue(Utterance* utterance) OVERRIDE; virtual void SpeakOrEnqueue(Utterance* utterance) override;
virtual void Stop() OVERRIDE; virtual void Stop() override;
virtual void Pause() OVERRIDE; virtual void Pause() override;
virtual void Resume() OVERRIDE; virtual void Resume() override;
virtual void OnTtsEvent(int utterance_id, virtual void OnTtsEvent(int utterance_id,
TtsEventType event_type, TtsEventType event_type,
int char_index, int char_index,
const std::string& error_message) OVERRIDE; const std::string& error_message) override;
virtual void GetVoices(content::BrowserContext* browser_context, virtual void GetVoices(content::BrowserContext* browser_context,
std::vector<VoiceData>* out_voices) OVERRIDE; std::vector<VoiceData>* out_voices) override;
virtual void VoicesChanged() OVERRIDE; virtual void VoicesChanged() override;
virtual void AddVoicesChangedDelegate( virtual void AddVoicesChangedDelegate(
VoicesChangedDelegate* delegate) OVERRIDE; VoicesChangedDelegate* delegate) override;
virtual void RemoveVoicesChangedDelegate( virtual void RemoveVoicesChangedDelegate(
VoicesChangedDelegate* delegate) OVERRIDE; VoicesChangedDelegate* delegate) override;
virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) OVERRIDE; virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override;
virtual TtsEngineDelegate* GetTtsEngineDelegate() OVERRIDE; virtual TtsEngineDelegate* GetTtsEngineDelegate() override;
virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) OVERRIDE; virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) override;
virtual int QueueSize() OVERRIDE; virtual int QueueSize() override;
protected: protected:
TtsControllerImpl(); TtsControllerImpl();

14
chromium_src/chrome/browser/speech/tts_linux.cc
View file

@ -32,18 +32,18 @@ struct SPDChromeVoice {
class TtsPlatformImplLinux : public TtsPlatformImpl { class TtsPlatformImplLinux : public TtsPlatformImpl {
public: public:
virtual bool PlatformImplAvailable() OVERRIDE; virtual bool PlatformImplAvailable() override;
virtual bool Speak( virtual bool Speak(
int utterance_id, int utterance_id,
const std::string& utterance, const std::string& utterance,
const std::string& lang, const std::string& lang,
const VoiceData& voice, const VoiceData& voice,
const UtteranceContinuousParameters& params) OVERRIDE; const UtteranceContinuousParameters& params) override;
virtual bool StopSpeaking() OVERRIDE; virtual bool StopSpeaking() override;
virtual void Pause() OVERRIDE; virtual void Pause() override;
virtual void Resume() OVERRIDE; virtual void Resume() override;
virtual bool IsSpeaking() OVERRIDE; virtual bool IsSpeaking() override;
virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE; virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
void OnSpeechEvent(SPDNotificationType type); void OnSpeechEvent(SPDNotificationType type);

14
chromium_src/chrome/browser/speech/tts_mac.mm
View file

@ -49,7 +49,7 @@ class TtsPlatformImplMac;
class TtsPlatformImplMac : public TtsPlatformImpl { class TtsPlatformImplMac : public TtsPlatformImpl {
public: public:
virtual bool PlatformImplAvailable() OVERRIDE { virtual bool PlatformImplAvailable() override {
return true; return true;
} }
@ -58,17 +58,17 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
const std::string& utterance, const std::string& utterance,
const std::string& lang, const std::string& lang,
const VoiceData& voice, const VoiceData& voice,
const UtteranceContinuousParameters& params) OVERRIDE; const UtteranceContinuousParameters& params) override;
virtual bool StopSpeaking() OVERRIDE; virtual bool StopSpeaking() override;
virtual void Pause() OVERRIDE; virtual void Pause() override;
virtual void Resume() OVERRIDE; virtual void Resume() override;
virtual bool IsSpeaking() OVERRIDE; virtual bool IsSpeaking() override;
virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE; virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
// Called by ChromeTtsDelegate when we get a callback from the // Called by ChromeTtsDelegate when we get a callback from the
// native speech engine. // native speech engine.

2
chromium_src/chrome/browser/speech/tts_win.cc
View file

@ -34,7 +34,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
virtual bool IsSpeaking(); virtual bool IsSpeaking();
virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE; virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
// Get the single instance of this class. // Get the single instance of this class.
static TtsPlatformImplWin* GetInstance(); static TtsPlatformImplWin* GetInstance();

4
chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm
View file

@ -45,8 +45,8 @@ class ColorChooserMac : public content::ColorChooser {
void DidChooseColorInColorPanel(SkColor color); void DidChooseColorInColorPanel(SkColor color);
void DidCloseColorPabel(); void DidCloseColorPabel();
virtual void End() OVERRIDE; virtual void End() override;
virtual void SetSelectedColor(SkColor color) OVERRIDE; virtual void SetSelectedColor(SkColor color) override;
private: private:
static ColorChooserMac* current_color_chooser_; static ColorChooserMac* current_color_chooser_;

8
chromium_src/chrome/browser/ui/views/color_chooser_aura.h
View file

@ -31,12 +31,12 @@ class ColorChooserAura : public content::ColorChooser,
ColorChooserAura(content::WebContents* web_contents, SkColor initial_color); ColorChooserAura(content::WebContents* web_contents, SkColor initial_color);
// content::ColorChooser overrides: // content::ColorChooser overrides:
virtual void End() OVERRIDE; virtual void End() override;
virtual void SetSelectedColor(SkColor color) OVERRIDE; virtual void SetSelectedColor(SkColor color) override;
// views::ColorChooserListener overrides: // views::ColorChooserListener overrides:
virtual void OnColorChosen(SkColor color) OVERRIDE; virtual void OnColorChosen(SkColor color) override;
virtual void OnColorChooserDialogClosed() OVERRIDE; virtual void OnColorChooserDialogClosed() override;
void DidEndColorChooser(); void DidEndColorChooser();

4
chromium_src/chrome/browser/ui/views/color_chooser_dialog.h
View file

@ -26,8 +26,8 @@ class ColorChooserDialog
virtual ~ColorChooserDialog(); virtual ~ColorChooserDialog();
// BaseShellDialog: // BaseShellDialog:
virtual bool IsRunning(gfx::NativeWindow owning_window) const OVERRIDE; virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
virtual void ListenerDestroyed() OVERRIDE; virtual void ListenerDestroyed() override;
private: private:
struct ExecuteOpenParams { struct ExecuteOpenParams {

4
chromium_src/chrome/browser/ui/views/color_chooser_win.cc
View file

@ -24,8 +24,8 @@ class ColorChooserWin : public content::ColorChooser,
~ColorChooserWin(); ~ColorChooserWin();
// content::ColorChooser overrides: // content::ColorChooser overrides:
virtual void End() OVERRIDE; virtual void End() override;
virtual void SetSelectedColor(SkColor color) OVERRIDE {} virtual void SetSelectedColor(SkColor color) override {}
// views::ColorChooserListener overrides: // views::ColorChooserListener overrides:
virtual void OnColorChosen(SkColor color); virtual void OnColorChosen(SkColor color);

4
chromium_src/chrome/renderer/printing/print_web_view_helper.h
View file

@ -79,9 +79,9 @@ class PrintWebViewHelper
}; };
// RenderViewObserver implementation. // RenderViewObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) override;
virtual void PrintPage(blink::WebLocalFrame* frame, virtual void PrintPage(blink::WebLocalFrame* frame,
bool user_initiated) OVERRIDE; bool user_initiated) override;
// Message handlers --------------------------------------------------------- // Message handlers ---------------------------------------------------------
#if !defined(DISABLE_BASIC_PRINTING) #if !defined(DISABLE_BASIC_PRINTING)

12
chromium_src/chrome/renderer/tts_dispatcher.h
View file

@ -37,15 +37,15 @@ class TtsDispatcher
virtual ~TtsDispatcher(); virtual ~TtsDispatcher();
// RenderProcessObserver override. // RenderProcessObserver override.
virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; virtual bool OnControlMessageReceived(const IPC::Message& message) override;
// blink::WebSpeechSynthesizer implementation. // blink::WebSpeechSynthesizer implementation.
virtual void updateVoiceList() OVERRIDE; virtual void updateVoiceList() override;
virtual void speak(const blink::WebSpeechSynthesisUtterance& utterance) virtual void speak(const blink::WebSpeechSynthesisUtterance& utterance)
OVERRIDE; override;
virtual void pause() OVERRIDE; virtual void pause() override;
virtual void resume() OVERRIDE; virtual void resume() override;
virtual void cancel() OVERRIDE; virtual void cancel() override;
blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id); blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);