Commit 9b85081a authored by dcheng's avatar dcheng Committed by Commit bot

Apply automated fixits for Chrome clang plugin to ash.

Working on trimming down plugin warnings on the Windows clang build.

BUG=467287
TBR=oshima

Review URL: https://codereview.chromium.org/1110843003

Cr-Commit-Position: refs/heads/master@{#327565}
parent 9dc987a8
...@@ -68,7 +68,8 @@ class AshWindowTreeHostWin : public AshWindowTreeHost, ...@@ -68,7 +68,8 @@ class AshWindowTreeHostWin : public AshWindowTreeHost,
} }
bool ConfineCursorToRootWindow() override { return false; } bool ConfineCursorToRootWindow() override { return false; }
void UnConfineCursor() override { NOTIMPLEMENTED(); } void UnConfineCursor() override { NOTIMPLEMENTED(); }
void SetRootWindowTransformer(scoped_ptr<RootWindowTransformer> transformer) { void SetRootWindowTransformer(
scoped_ptr<RootWindowTransformer> transformer) override {
transformer_helper_.SetRootWindowTransformer(transformer.Pass()); transformer_helper_.SetRootWindowTransformer(transformer.Pass());
} }
gfx::Insets GetHostInsets() const override { gfx::Insets GetHostInsets() const override {
...@@ -88,7 +89,7 @@ class AshWindowTreeHostWin : public AshWindowTreeHost, ...@@ -88,7 +89,7 @@ class AshWindowTreeHostWin : public AshWindowTreeHost,
void SetRootTransform(const gfx::Transform& transform) override { void SetRootTransform(const gfx::Transform& transform) override {
transformer_helper_.SetTransform(transform); transformer_helper_.SetTransform(transform);
} }
gfx::Transform GetRootTransform() const { gfx::Transform GetRootTransform() const override {
return transformer_helper_.GetTransform(); return transformer_helper_.GetTransform();
} }
gfx::Transform GetInverseRootTransform() const override { gfx::Transform GetInverseRootTransform() const override {
......
...@@ -14,7 +14,7 @@ namespace ash { ...@@ -14,7 +14,7 @@ namespace ash {
class TrayAudioWin : public TrayAudio { class TrayAudioWin : public TrayAudio {
public: public:
explicit TrayAudioWin(SystemTray* system_tray); explicit TrayAudioWin(SystemTray* system_tray);
virtual ~TrayAudioWin(); ~TrayAudioWin() override;
private: private:
DISALLOW_COPY_AND_ASSIGN(TrayAudioWin); DISALLOW_COPY_AND_ASSIGN(TrayAudioWin);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment