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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Issue 5783006: Cleanup: Remove unneeded includes of notification_service.h in other headers.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #import "browser_actions_controller.h" 5 #import "browser_actions_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <string> 8 #include <string>
9 9
10 #include "base/nsimage_cache_mac.h" 10 #include "base/nsimage_cache_mac.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "chrome/browser/extensions/extension_browser_event_router.h" 12 #include "chrome/browser/extensions/extension_browser_event_router.h"
13 #include "chrome/browser/extensions/extension_host.h" 13 #include "chrome/browser/extensions/extension_host.h"
14 #include "chrome/browser/extensions/extension_toolbar_model.h" 14 #include "chrome/browser/extensions/extension_toolbar_model.h"
15 #include "chrome/browser/extensions/extensions_service.h" 15 #include "chrome/browser/extensions/extensions_service.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/tab_contents/tab_contents.h" 18 #include "chrome/browser/tab_contents/tab_contents.h"
19 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
20 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 20 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
21 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 21 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
22 #import "chrome/browser/ui/cocoa/extensions/chevron_menu_button.h" 22 #import "chrome/browser/ui/cocoa/extensions/chevron_menu_button.h"
23 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 23 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
24 #import "chrome/browser/ui/cocoa/menu_button.h" 24 #import "chrome/browser/ui/cocoa/menu_button.h"
25 #include "chrome/common/extensions/extension_action.h" 25 #include "chrome/common/extensions/extension_action.h"
26 #include "chrome/common/notification_observer.h" 26 #include "chrome/common/notification_observer.h"
27 #include "chrome/common/notification_registrar.h" 27 #include "chrome/common/notification_registrar.h"
28 #include "chrome/common/notification_service.h"
28 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
29 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 30 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
30 31
31 NSString* const kBrowserActionVisibilityChangedNotification = 32 NSString* const kBrowserActionVisibilityChangedNotification =
32 @"BrowserActionVisibilityChangedNotification"; 33 @"BrowserActionVisibilityChangedNotification";
33 34
34 namespace { 35 namespace {
35 const CGFloat kAnimationDuration = 0.2; 36 const CGFloat kAnimationDuration = 0.2;
36 37
37 const CGFloat kChevronWidth = 14.0; 38 const CGFloat kChevronWidth = 14.0;
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 if (profile_->IsOffTheRecord()) 855 if (profile_->IsOffTheRecord())
855 index = toolbarModel_->IncognitoIndexToOriginal(index); 856 index = toolbarModel_->IncognitoIndexToOriginal(index);
856 if (index < toolbarModel_->size()) { 857 if (index < toolbarModel_->size()) {
857 const Extension* extension = toolbarModel_->GetExtensionByIndex(index); 858 const Extension* extension = toolbarModel_->GetExtensionByIndex(index);
858 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())]; 859 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
859 } 860 }
860 return nil; 861 return nil;
861 } 862 }
862 863
863 @end 864 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698