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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.h

Issue 1214243003: [Extensions UI] Clean up extension icon generation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/skia/ImageSkia Created 5 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
7 7
8 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" 8 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
9 #include "content/public/browser/notification_observer.h" 9 #include "content/public/browser/notification_observer.h"
10 #include "content/public/browser/notification_registrar.h" 10 #include "content/public/browser/notification_registrar.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 gfx::ImageSkia GetIconForTest(); 110 gfx::ImageSkia GetIconForTest();
111 111
112 bool wants_to_run_for_testing() const { return wants_to_run_; } 112 bool wants_to_run_for_testing() const { return wants_to_run_; }
113 113
114 private: 114 private:
115 // views::MenuButton: 115 // views::MenuButton:
116 gfx::Size GetPreferredSize() const override; 116 gfx::Size GetPreferredSize() const override;
117 void OnDragDone() override; 117 void OnDragDone() override;
118 void ViewHierarchyChanged( 118 void ViewHierarchyChanged(
119 const ViewHierarchyChangedDetails& details) override; 119 const ViewHierarchyChangedDetails& details) override;
120 void PaintChildren(const ui::PaintContext& context) override;
121 void OnPaintBorder(gfx::Canvas* canvas) override; 120 void OnPaintBorder(gfx::Canvas* canvas) override;
122 121
123 // ToolbarActionViewDelegateViews: 122 // ToolbarActionViewDelegateViews:
124 views::View* GetAsView() override; 123 views::View* GetAsView() override;
125 views::FocusManager* GetFocusManagerForAccelerator() override; 124 views::FocusManager* GetFocusManagerForAccelerator() override;
126 views::View* GetReferenceViewForPopup() override; 125 views::View* GetReferenceViewForPopup() override;
127 bool IsMenuRunning() const override; 126 bool IsMenuRunning() const override;
128 void OnPopupShown(bool by_user) override; 127 void OnPopupShown(bool by_user) override;
129 void OnPopupClosed() override; 128 void OnPopupClosed() override;
130 129
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 base::Closure followup_context_menu_task_; 171 base::Closure followup_context_menu_task_;
173 172
174 content::NotificationRegistrar registrar_; 173 content::NotificationRegistrar registrar_;
175 174
176 base::WeakPtrFactory<ToolbarActionView> weak_factory_; 175 base::WeakPtrFactory<ToolbarActionView> weak_factory_;
177 176
178 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView); 177 DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);
179 }; 178 };
180 179
181 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ 180 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698