scoped_ptr.PassAs is removed
This commit is contained in:
parent
43421aedcf
commit
5c78ecfe40
21 changed files with 84 additions and 85 deletions
|
@ -45,8 +45,8 @@ class ColorChooserMac : public content::ColorChooser {
|
|||
void DidChooseColorInColorPanel(SkColor color);
|
||||
void DidCloseColorPabel();
|
||||
|
||||
virtual void End() OVERRIDE;
|
||||
virtual void SetSelectedColor(SkColor color) OVERRIDE;
|
||||
virtual void End() override;
|
||||
virtual void SetSelectedColor(SkColor color) override;
|
||||
|
||||
private:
|
||||
static ColorChooserMac* current_color_chooser_;
|
||||
|
|
|
@ -31,12 +31,12 @@ class ColorChooserAura : public content::ColorChooser,
|
|||
ColorChooserAura(content::WebContents* web_contents, SkColor initial_color);
|
||||
|
||||
// content::ColorChooser overrides:
|
||||
virtual void End() OVERRIDE;
|
||||
virtual void SetSelectedColor(SkColor color) OVERRIDE;
|
||||
virtual void End() override;
|
||||
virtual void SetSelectedColor(SkColor color) override;
|
||||
|
||||
// views::ColorChooserListener overrides:
|
||||
virtual void OnColorChosen(SkColor color) OVERRIDE;
|
||||
virtual void OnColorChooserDialogClosed() OVERRIDE;
|
||||
virtual void OnColorChosen(SkColor color) override;
|
||||
virtual void OnColorChooserDialogClosed() override;
|
||||
|
||||
void DidEndColorChooser();
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ class ColorChooserDialog
|
|||
virtual ~ColorChooserDialog();
|
||||
|
||||
// BaseShellDialog:
|
||||
virtual bool IsRunning(gfx::NativeWindow owning_window) const OVERRIDE;
|
||||
virtual void ListenerDestroyed() OVERRIDE;
|
||||
virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
|
||||
virtual void ListenerDestroyed() override;
|
||||
|
||||
private:
|
||||
struct ExecuteOpenParams {
|
||||
|
|
|
@ -24,8 +24,8 @@ class ColorChooserWin : public content::ColorChooser,
|
|||
~ColorChooserWin();
|
||||
|
||||
// content::ColorChooser overrides:
|
||||
virtual void End() OVERRIDE;
|
||||
virtual void SetSelectedColor(SkColor color) OVERRIDE {}
|
||||
virtual void End() override;
|
||||
virtual void SetSelectedColor(SkColor color) override {}
|
||||
|
||||
// views::ColorChooserListener overrides:
|
||||
virtual void OnColorChosen(SkColor color);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue