chrome/browser/cocoa/extensions/browser_actions_controller.mm - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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 | « chrome/browser/cocoa/custom_home_pages_model_unittest.mm ('k') | chrome/browser/cocoa/extensions/extension_action_context_menu.mm » ('j') | chrome/chrome_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/browser.h"	12 #include "chrome/browser/browser.h"

13 #include "chrome/browser/pref_service.h"

14 #import "chrome/browser/cocoa/extensions/browser_action_button.h"	13 #import "chrome/browser/cocoa/extensions/browser_action_button.h"

15 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h"	14 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h"

	15 #import "chrome/browser/cocoa/extensions/chevron_menu_button.h"

16 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h"	16 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h"

17 #import "chrome/browser/cocoa/extensions/chevron_menu_button.h"

18 #import "chrome/browser/cocoa/menu_button.h"	17 #import "chrome/browser/cocoa/menu_button.h"

19 #include "chrome/browser/extensions/extension_browser_event_router.h"	18 #include "chrome/browser/extensions/extension_browser_event_router.h"

20 #include "chrome/browser/extensions/extension_host.h"	19 #include "chrome/browser/extensions/extension_host.h"

21 #include "chrome/browser/extensions/extension_toolbar_model.h"	20 #include "chrome/browser/extensions/extension_toolbar_model.h"

22 #include "chrome/browser/extensions/extensions_service.h"	21 #include "chrome/browser/extensions/extensions_service.h"

	22 #include "chrome/browser/prefs/pref_service.h"

23 #include "chrome/browser/profile.h"	23 #include "chrome/browser/profile.h"

24 #include "chrome/browser/tab_contents/tab_contents.h"	24 #include "chrome/browser/tab_contents/tab_contents.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/pref_names.h"	28 #include "chrome/common/pref_names.h"

29 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"	29 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

30	30

31 NSString* const kBrowserActionVisibilityChangedNotification =	31 NSString* const kBrowserActionVisibilityChangedNotification =

32 @"BrowserActionVisibilityChangedNotification";	32 @"BrowserActionVisibilityChangedNotification";

(...skipping 821 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
854 if (profile_->IsOffTheRecord())	854 if (profile_->IsOffTheRecord())

855 index = toolbarModel_->IncognitoIndexToOriginal(index);	855 index = toolbarModel_->IncognitoIndexToOriginal(index);

856 if (index < toolbarModel_->size()) {	856 if (index < toolbarModel_->size()) {

857 Extension* extension = toolbarModel_->GetExtensionByIndex(index);	857 Extension* extension = toolbarModel_->GetExtensionByIndex(index);

858 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];	858 return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];

859 }	859 }

860 return nil;	860 return nil;

861 }	861 }

862	862

863 @end	863 @end

OLD	NEW