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

Side by Side Diff: chrome/browser/extensions/api/extension_action/extension_action_api.cc

Issue 12213093: Remove ImageLoadingTracker class (Closed) Base URL: https://git.chromium.org/chromium/src.git@Issue_163929
Patch Set: Fix merge conflict Created 7 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/webview/webview_api.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) 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 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 5 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/common/chrome_notification_types.h" 25 #include "chrome/common/chrome_notification_types.h"
26 #include "chrome/common/extensions/api/extension_action/action_info.h" 26 #include "chrome/common/extensions/api/extension_action/action_info.h"
27 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h " 27 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h "
28 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h" 28 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h"
29 #include "chrome/common/extensions/extension_manifest_constants.h" 29 #include "chrome/common/extensions/extension_manifest_constants.h"
30 #include "chrome/common/extensions/manifest_handler.h" 30 #include "chrome/common/extensions/manifest_handler.h"
31 #include "chrome/common/render_messages.h" 31 #include "chrome/common/render_messages.h"
32 #include "content/public/browser/navigation_entry.h" 32 #include "content/public/browser/navigation_entry.h"
33 #include "content/public/browser/notification_service.h" 33 #include "content/public/browser/notification_service.h"
34 #include "extensions/common/error_utils.h" 34 #include "extensions/common/error_utils.h"
35 #include "ui/gfx/image/image_skia.h"
35 36
36 namespace extensions { 37 namespace extensions {
37 38
38 namespace { 39 namespace {
39 40
40 const char kBrowserActionStorageKey[] = "browser_action"; 41 const char kBrowserActionStorageKey[] = "browser_action";
41 const char kPopupUrlStorageKey[] = "poupup_url"; 42 const char kPopupUrlStorageKey[] = "poupup_url";
42 const char kTitleStorageKey[] = "title"; 43 const char kTitleStorageKey[] = "title";
43 const char kIconStorageKey[] = "icon"; 44 const char kIconStorageKey[] = "icon";
44 const char kBadgeTextStorageKey[] = "badge_text"; 45 const char kBadgeTextStorageKey[] = "badge_text";
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 return true; 728 return true;
728 } 729 }
729 730
730 bool EnablePageActionsFunction::RunImpl() { 731 bool EnablePageActionsFunction::RunImpl() {
731 return SetPageActionEnabled(true); 732 return SetPageActionEnabled(true);
732 } 733 }
733 734
734 bool DisablePageActionsFunction::RunImpl() { 735 bool DisablePageActionsFunction::RunImpl() {
735 return SetPageActionEnabled(false); 736 return SetPageActionEnabled(false);
736 } 737 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/webview/webview_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698