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

chore: fix more chromium-style errors in windows code (#13487)

Browse source 
Finding more chromium-style linting errors as I build more of the windows code :)
This commit is contained in:
Jeremy Apthorp 2018-06-28 14:20:11 -07:00 • committed by GitHub
parent 003a92e099
commit d6af3bfcd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,13 +23,15 @@ class ColorChooserDialog
ColorChooserDialog(views::ColorChooserListener* listener,
SkColor initial_color,
gfx::NativeWindow owning_window);
virtual ~ColorChooserDialog();
// BaseShellDialog:
virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
virtual void ListenerDestroyed() override;
bool IsRunning(gfx::NativeWindow owning_window) const override;
void ListenerDestroyed() override;
private:
~ColorChooserDialog() override;
friend class base::RefCountedThreadSafe<ColorChooserDialog>;
struct ExecuteOpenParams {
ExecuteOpenParams(SkColor color, RunState run_state, HWND owner);
SkColor color;

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

@ -22,15 +22,15 @@ class ColorChooserWin : public content::ColorChooser,
SkColor initial_color);
ColorChooserWin(content::WebContents* web_contents, SkColor initial_color);
~ColorChooserWin();
~ColorChooserWin() override;
// content::ColorChooser overrides:
virtual void End() override;
virtual void SetSelectedColor(SkColor color) override {}
void End() override;
void SetSelectedColor(SkColor color) override {}
// views::ColorChooserListener overrides:
virtual void OnColorChosen(SkColor color);
virtual void OnColorChooserDialogClosed();
void OnColorChosen(SkColor color) override;
void OnColorChooserDialogClosed() override;
private:
static ColorChooserWin* current_color_chooser_;