chrome/browser/extensions/extension_toolbar_model.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/extensions/extension_toolbar_model.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/extension_tabs_apitest.cc ('k') | chrome/browser/extensions/extension_web_ui.cc » ('j') | no next file with comments »

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

6	6

	7 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/extensions/browser_event_router.h"	8 #include "chrome/browser/extensions/browser_event_router.h"

8 #include "chrome/browser/extensions/extension_action.h"	9 #include "chrome/browser/extensions/extension_action.h"

9 #include "chrome/browser/extensions/extension_action_manager.h"	10 #include "chrome/browser/extensions/extension_action_manager.h"

10 #include "chrome/browser/extensions/extension_prefs.h"	11 #include "chrome/browser/extensions/extension_prefs.h"

11 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

12 #include "chrome/browser/extensions/extension_tab_util.h"	13 #include "chrome/browser/extensions/extension_tab_util.h"

13 #include "chrome/browser/extensions/tab_helper.h"	14 #include "chrome/browser/extensions/tab_helper.h"

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

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_tabstrip.h"	17 #include "chrome/browser/ui/browser_tabstrip.h"

18 #include "chrome/browser/ui/tabs/tab_strip_model.h"	18 #include "chrome/browser/ui/tabs/tab_strip_model.h"

19 #include "chrome/common/chrome_notification_types.h"	19 #include "chrome/common/chrome_notification_types.h"

20 #include "chrome/common/extensions/extension.h"	20 #include "chrome/common/extensions/extension.h"

21 #include "chrome/common/extensions/feature_switch.h"	21 #include "chrome/common/extensions/feature_switch.h"

22 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

23 #include "content/public/browser/notification_details.h"	23 #include "content/public/browser/notification_details.h"

24 #include "content/public/browser/notification_source.h"	24 #include "content/public/browser/notification_source.h"

(...skipping 386 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
411 for (ExtensionList::iterator iter = toolbar_items_.begin();	411 for (ExtensionList::iterator iter = toolbar_items_.begin();

412 iter != toolbar_items_.end();	412 iter != toolbar_items_.end();

413 ++iter, ++i) {	413 ++iter, ++i) {

414 if (original_index == i)	414 if (original_index == i)

415 break;	415 break;

416 if (service_->IsIncognitoEnabled((*iter)->id()))	416 if (service_->IsIncognitoEnabled((*iter)->id()))

417 ++incognito_index;	417 ++incognito_index;

418 }	418 }

419 return incognito_index;	419 return incognito_index;

420 }	420 }

OLD	NEW