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

Side by Side Diff: ash/shell/window_type_launcher.h

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_unittest.cc ('k') | ash/shell/window_type_launcher.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_SHELL_WINDOW_TYPE_LAUNCHER_H_ 5 #ifndef ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
6 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 6 #define ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
7 7
8 #include "ui/views/context_menu_controller.h" 8 #include "ui/views/context_menu_controller.h"
9 #include "ui/views/controls/button/button.h" 9 #include "ui/views/controls/button/button.h"
10 #include "ui/views/controls/menu/menu_delegate.h" 10 #include "ui/views/controls/menu/menu_delegate.h"
(...skipping 25 matching lines...) Expand all
36 private: 36 private:
37 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 37 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
38 38
39 enum MenuCommands { 39 enum MenuCommands {
40 COMMAND_NEW_WINDOW = 1, 40 COMMAND_NEW_WINDOW = 1,
41 COMMAND_TOGGLE_FULLSCREEN = 3, 41 COMMAND_TOGGLE_FULLSCREEN = 3,
42 }; 42 };
43 43
44 // Overridden from views::View: 44 // Overridden from views::View:
45 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 45 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
46 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 46 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
47 47
48 // Overridden from views::WidgetDelegate: 48 // Overridden from views::WidgetDelegate:
49 virtual views::View* GetContentsView() OVERRIDE; 49 virtual views::View* GetContentsView() OVERRIDE;
50 virtual bool CanResize() const OVERRIDE; 50 virtual bool CanResize() const OVERRIDE;
51 virtual string16 GetWindowTitle() const OVERRIDE; 51 virtual string16 GetWindowTitle() const OVERRIDE;
52 virtual bool CanMaximize() const OVERRIDE; 52 virtual bool CanMaximize() const OVERRIDE;
53 53
54 // Overridden from views::ButtonListener: 54 // Overridden from views::ButtonListener:
55 virtual void ButtonPressed(views::Button* sender, 55 virtual void ButtonPressed(views::Button* sender,
56 const ui::Event& event) OVERRIDE; 56 const ui::Event& event) OVERRIDE;
(...skipping 25 matching lines...) Expand all
82 scoped_ptr<views::MenuRunner> menu_runner_; 82 scoped_ptr<views::MenuRunner> menu_runner_;
83 #endif 83 #endif
84 84
85 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); 85 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
86 }; 86 };
87 87
88 } // namespace shell 88 } // namespace shell
89 } // namespace ash 89 } // namespace ash
90 90
91 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 91 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view_unittest.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698