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

Side by Side Diff: chrome/browser/extensions/extension_action.h

Issue 1363463002: [Extensions Toolbar] Add a finch config for the redesign (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 (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_EXTENSIONS_EXTENSION_ACTION_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "chrome/common/extensions/api/extension_action/action_info.h" 14 #include "chrome/common/extensions/api/extension_action/action_info.h"
15 #include "third_party/skia/include/core/SkColor.h" 15 #include "third_party/skia/include/core/SkColor.h"
16 #include "ui/gfx/image/image.h"
16 17
17 class GURL; 18 class GURL;
18 19
19 namespace content { 20 namespace content {
20 class BrowserContext; 21 class BrowserContext;
21 } 22 }
22 23
23 namespace extensions { 24 namespace extensions {
24 class Extension; 25 class Extension;
25 class IconImage; 26 class IconImage;
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 std::map<int, std::map<int, std::vector<gfx::Image> > > declarative_icon_; 281 std::map<int, std::map<int, std::vector<gfx::Image> > > declarative_icon_;
281 282
282 // ExtensionIconSet containing paths to bitmaps from which default icon's 283 // ExtensionIconSet containing paths to bitmaps from which default icon's
283 // image representations will be selected. 284 // image representations will be selected.
284 scoped_ptr<ExtensionIconSet> default_icon_; 285 scoped_ptr<ExtensionIconSet> default_icon_;
285 286
286 // The default icon image, if |default_icon_| exists. 287 // The default icon image, if |default_icon_| exists.
287 // Lazily initialized via LoadDefaultIconImage(). 288 // Lazily initialized via LoadDefaultIconImage().
288 scoped_ptr<extensions::IconImage> default_icon_image_; 289 scoped_ptr<extensions::IconImage> default_icon_image_;
289 290
291 // The lazily-initialized image for a placeholder icon, in the event that the
292 // extension doesn't have its own icon. (Mutable to allow lazy init.)
Finnur 2015/09/22 14:18:32 ... to allow lazy init in GetDefaultIconImage.
Devlin 2015/09/23 00:28:35 Done.
293 mutable gfx::Image placeholder_icon_image_;
294
290 // The id for the ExtensionAction, for example: "RssPageAction". This is 295 // The id for the ExtensionAction, for example: "RssPageAction". This is
291 // needed for compat with an older version of the page actions API. 296 // needed for compat with an older version of the page actions API.
292 std::string id_; 297 std::string id_;
293 298
294 DISALLOW_COPY_AND_ASSIGN(ExtensionAction); 299 DISALLOW_COPY_AND_ASSIGN(ExtensionAction);
295 }; 300 };
296 301
297 template<> 302 template<>
298 struct ExtensionAction::ValueTraits<int> { 303 struct ExtensionAction::ValueTraits<int> {
299 static int CreateEmpty() { 304 static int CreateEmpty() {
300 return -1; 305 return -1;
301 } 306 }
302 }; 307 };
303 308
304 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_ 309 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698