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

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
Download patch file Download diff file Expand all files Collapse all files

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 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_;

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);
// 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();

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

@ -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 {

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

@ -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);