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

Side by Side Diff: ui/views/touchui/touch_editing_menu.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 | « ui/views/test/test_views_delegate.h ('k') | ui/views/touchui/touch_editing_menu.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 UI_VIEWS_TOUCHUI_TOUCH_EDITING_MENU_H_ 5 #ifndef UI_VIEWS_TOUCHUI_TOUCH_EDITING_MENU_H_
6 #define UI_VIEWS_TOUCHUI_TOUCH_EDITING_MENU_H_ 6 #define UI_VIEWS_TOUCHUI_TOUCH_EDITING_MENU_H_
7 7
8 #include "ui/gfx/point.h" 8 #include "ui/gfx/point.h"
9 #include "ui/views/bubble/bubble_delegate.h" 9 #include "ui/views/bubble/bubble_delegate.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; 62 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
63 63
64 // Overridden from BubbleDelegateView. 64 // Overridden from BubbleDelegateView.
65 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 65 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
66 66
67 // Queries the |controller_| for what elements to show in the menu and sizes 67 // Queries the |controller_| for what elements to show in the menu and sizes
68 // the menu appropriately. 68 // the menu appropriately.
69 void CreateButtons(); 69 void CreateButtons();
70 70
71 // Helper method to create a single button. 71 // Helper method to create a single button.
72 Button* CreateButton(const string16& title, int tag); 72 Button* CreateButton(const base::string16& title, int tag);
73 73
74 TouchEditingMenuController* controller_; 74 TouchEditingMenuController* controller_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(TouchEditingMenuView); 76 DISALLOW_COPY_AND_ASSIGN(TouchEditingMenuView);
77 }; 77 };
78 78
79 } // namespace views 79 } // namespace views
80 80
81 #endif // UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_ 81 #endif // UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/touchui/touch_editing_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698