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/controls/scrollbar/base_scroll_bar.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
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 UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 5 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "ui/views/animation/scroll_animator.h" 9 #include "ui/views/animation/scroll_animator.h"
10 #include "ui/views/context_menu_controller.h" 10 #include "ui/views/context_menu_controller.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 // ScrollDelegate overrides: 87 // ScrollDelegate overrides:
88 virtual bool OnScroll(float dx, float dy) OVERRIDE; 88 virtual bool OnScroll(float dx, float dy) OVERRIDE;
89 89
90 // ContextMenuController overrides: 90 // ContextMenuController overrides:
91 virtual void ShowContextMenuForView(View* source, 91 virtual void ShowContextMenuForView(View* source,
92 const gfx::Point& point, 92 const gfx::Point& point,
93 ui::MenuSourceType source_type) OVERRIDE; 93 ui::MenuSourceType source_type) OVERRIDE;
94 94
95 // Menu::Delegate overrides: 95 // Menu::Delegate overrides:
96 virtual string16 GetLabel(int id) const OVERRIDE; 96 virtual base::string16 GetLabel(int id) const OVERRIDE;
97 virtual bool IsCommandEnabled(int id) const OVERRIDE; 97 virtual bool IsCommandEnabled(int id) const OVERRIDE;
98 virtual void ExecuteCommand(int id) OVERRIDE; 98 virtual void ExecuteCommand(int id) OVERRIDE;
99 99
100 protected: 100 protected:
101 // View overrides: 101 // View overrides:
102 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE = 0; 102 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE = 0;
103 103
104 BaseScrollBarThumb* GetThumb() const; 104 BaseScrollBarThumb* GetThumb() const;
105 CustomButton::ButtonState GetThumbTrackState() const; 105 CustomButton::ButtonState GetThumbTrackState() const;
106 106
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 scoped_ptr<MenuRunner> menu_runner_; 178 scoped_ptr<MenuRunner> menu_runner_;
179 scoped_ptr<ScrollAnimator> scroll_animator_; 179 scoped_ptr<ScrollAnimator> scroll_animator_;
180 180
181 DISALLOW_COPY_AND_ASSIGN(BaseScrollBar); 181 DISALLOW_COPY_AND_ASSIGN(BaseScrollBar);
182 }; 182 };
183 183
184 } // namespace views 184 } // namespace views
185 185
186 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 186 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
OLDNEW
« no previous file with comments | « ui/views/controls/progress_bar_unittest.cc ('k') | ui/views/controls/scrollbar/base_scroll_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698