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

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

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 8 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
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 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 const content::NotificationSource& source, 106 const content::NotificationSource& source,
107 const content::NotificationDetails& details) OVERRIDE; 107 const content::NotificationDetails& details) OVERRIDE;
108 108
109 // Overridden from ui::AcceleratorProvider: 109 // Overridden from ui::AcceleratorProvider:
110 virtual bool GetAcceleratorForCommandId( 110 virtual bool GetAcceleratorForCommandId(
111 int command_id, ui::Accelerator* accelerator) OVERRIDE; 111 int command_id, ui::Accelerator* accelerator) OVERRIDE;
112 112
113 // Overridden from views::View: 113 // Overridden from views::View:
114 virtual gfx::Size GetPreferredSize() OVERRIDE; 114 virtual gfx::Size GetPreferredSize() OVERRIDE;
115 virtual void Layout() OVERRIDE; 115 virtual void Layout() OVERRIDE;
116 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 116 virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
117 virtual bool GetDropFormats( 117 virtual bool GetDropFormats(
118 int* formats, 118 int* formats,
119 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 119 std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
120 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; 120 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
121 virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE; 121 virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
122 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE; 122 virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
123 virtual void OnThemeChanged() OVERRIDE; 123 virtual void OnThemeChanged() OVERRIDE;
124 virtual std::string GetClassName() const OVERRIDE; 124 virtual std::string GetClassName() const OVERRIDE;
125 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE; 125 virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE;
126 126
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 // A list of listeners to call when the menu opens. 203 // A list of listeners to call when the menu opens.
204 ObserverList<views::MenuListener> menu_listeners_; 204 ObserverList<views::MenuListener> menu_listeners_;
205 205
206 content::NotificationRegistrar registrar_; 206 content::NotificationRegistrar registrar_;
207 207
208 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 208 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
209 }; 209 };
210 210
211 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 211 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698