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

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

Issue 12390049: views: Migrate ash_shell buttons to LabelButton (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: set style Created 7 years, 9 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/shell/widgets.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"
11 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
12 12
13 namespace views { 13 namespace views {
14 class MenuRunner; 14 class MenuRunner;
15 class NativeTextButton; 15 class LabelButton;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 namespace shell { 19 namespace shell {
20 20
21 // The contents view/delegate of a window that shows some buttons that create 21 // The contents view/delegate of a window that shows some buttons that create
22 // various window types. 22 // various window types.
23 #if defined(OS_MACOSX) 23 #if defined(OS_MACOSX)
24 class WindowTypeLauncher : public views::WidgetDelegateView, 24 class WindowTypeLauncher : public views::WidgetDelegateView,
25 public views::ButtonListener { 25 public views::ButtonListener {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 #if !defined(OS_MACOSX) 58 #if !defined(OS_MACOSX)
59 // Overridden from views::MenuDelegate: 59 // Overridden from views::MenuDelegate:
60 virtual void ExecuteCommand(int id) OVERRIDE; 60 virtual void ExecuteCommand(int id) OVERRIDE;
61 61
62 // Override from views::ContextMenuController: 62 // Override from views::ContextMenuController:
63 virtual void ShowContextMenuForView(views::View* source, 63 virtual void ShowContextMenuForView(views::View* source,
64 const gfx::Point& point) OVERRIDE; 64 const gfx::Point& point) OVERRIDE;
65 #endif // !defined(OS_MACOSX) 65 #endif // !defined(OS_MACOSX)
66 66
67 views::NativeTextButton* create_button_; 67 views::LabelButton* create_button_;
68 views::NativeTextButton* create_persistant_button_; 68 views::LabelButton* create_persistant_button_;
69 views::NativeTextButton* panel_button_; 69 views::LabelButton* panel_button_;
70 views::NativeTextButton* create_nonresizable_button_; 70 views::LabelButton* create_nonresizable_button_;
71 views::NativeTextButton* bubble_button_; 71 views::LabelButton* bubble_button_;
72 views::NativeTextButton* lock_button_; 72 views::LabelButton* lock_button_;
73 views::NativeTextButton* widgets_button_; 73 views::LabelButton* widgets_button_;
74 views::NativeTextButton* system_modal_button_; 74 views::LabelButton* system_modal_button_;
75 views::NativeTextButton* window_modal_button_; 75 views::LabelButton* window_modal_button_;
76 views::NativeTextButton* child_modal_button_; 76 views::LabelButton* child_modal_button_;
77 views::NativeTextButton* transient_button_; 77 views::LabelButton* transient_button_;
78 views::NativeTextButton* examples_button_; 78 views::LabelButton* examples_button_;
79 views::NativeTextButton* show_hide_window_button_; 79 views::LabelButton* show_hide_window_button_;
80 views::NativeTextButton* show_screensaver_; 80 views::LabelButton* show_screensaver_;
81 views::NativeTextButton* show_web_notification_; 81 views::LabelButton* show_web_notification_;
82 #if !defined(OS_MACOSX) 82 #if !defined(OS_MACOSX)
83 scoped_ptr<views::MenuRunner> menu_runner_; 83 scoped_ptr<views::MenuRunner> menu_runner_;
84 #endif 84 #endif
85 85
86 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); 86 DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
87 }; 87 };
88 88
89 } // namespace shell 89 } // namespace shell
90 } // namespace ash 90 } // namespace ash
91 91
92 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_ 92 #endif // ASH_SHELL_WINDOW_TYPE_LAUNCHER_H_
OLDNEW
« no previous file with comments | « ash/shell/widgets.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698