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

Side by Side Diff: chrome/browser/ui/views/toolbar_view.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/browser/ui/views/toolbar_view.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 virtual void Layout() OVERRIDE; 121 virtual void Layout() OVERRIDE;
122 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 122 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
123 virtual bool GetDropFormats( 123 virtual bool GetDropFormats(
124 int* formats, 124 int* formats,
125 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 125 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
126 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; 126 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
127 virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE; 127 virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
128 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE; 128 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
129 virtual void OnThemeChanged() OVERRIDE; 129 virtual void OnThemeChanged() OVERRIDE;
130 virtual std::string GetClassName() const OVERRIDE; 130 virtual std::string GetClassName() const OVERRIDE;
131 virtual bool AcceleratorPressed(const views::Accelerator& acc) OVERRIDE; 131 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE;
132 132
133 // The apparent horizontal space between most items, and the vertical padding 133 // The apparent horizontal space between most items, and the vertical padding
134 // above and below them. 134 // above and below them.
135 static const int kStandardSpacing; 135 static const int kStandardSpacing;
136 // The top of the toolbar has an edge we have to skip over in addition to the 136 // The top of the toolbar has an edge we have to skip over in addition to the
137 // standard spacing. 137 // standard spacing.
138 static const int kVertSpacing; 138 static const int kVertSpacing;
139 139
140 protected: 140 protected:
141 141
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 // A list of listeners to call when the menu opens. 210 // A list of listeners to call when the menu opens.
211 ObserverList<views::MenuListener> menu_listeners_; 211 ObserverList<views::MenuListener> menu_listeners_;
212 212
213 content::NotificationRegistrar registrar_; 213 content::NotificationRegistrar registrar_;
214 214
215 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 215 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
216 }; 216 };
217 217
218 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 218 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/task_manager_view.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698