Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: ash/launcher/tabbed_launcher_button.h

Issue 9307036: Revert Aura changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/launcher/tabbed_launcher_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_ 5 #ifndef ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
6 #define ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_ 6 #define ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 26 matching lines...) Expand all
37 protected: 37 protected:
38 // View overrides: 38 // View overrides:
39 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 39 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
40 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 40 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
41 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 41 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
42 virtual void OnMouseCaptureLost() OVERRIDE; 42 virtual void OnMouseCaptureLost() OVERRIDE;
43 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE; 43 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
44 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; 44 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
45 virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE; 45 virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
46 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; 46 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
47 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
48 47
49 private: 48 private:
50 // Used as the delegate for |animation_|. TabbedLauncherButton doesn't 49 // Used as the delegate for |animation_|. TabbedLauncherButton doesn't
51 // directly implement AnimationDelegate as one of it's superclasses already 50 // directly implement AnimationDelegate as one of it's superclasses already
52 // does. 51 // does.
53 class AnimationDelegateImpl : public ui::AnimationDelegate { 52 class AnimationDelegateImpl : public ui::AnimationDelegate {
54 public: 53 public:
55 explicit AnimationDelegateImpl(TabbedLauncherButton* host); 54 explicit AnimationDelegateImpl(TabbedLauncherButton* host);
56 virtual ~AnimationDelegateImpl(); 55 virtual ~AnimationDelegateImpl();
57 56
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 96
98 views::GlowHoverController hover_controller_; 97 views::GlowHoverController hover_controller_;
99 98
100 DISALLOW_COPY_AND_ASSIGN(TabbedLauncherButton); 99 DISALLOW_COPY_AND_ASSIGN(TabbedLauncherButton);
101 }; 100 };
102 101
103 } // namespace internal 102 } // namespace internal
104 } // namespace ash 103 } // namespace ash
105 104
106 #endif // ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_ 105 #endif // ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/launcher/tabbed_launcher_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698