chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 10696208: Move ExtensionEventRouter and related into extensions namespace

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed bug + latest master Created 8 years, 5 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

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 #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/sys_string_conversions.h"	10 #include "base/sys_string_conversions.h"

11 #include "chrome/browser/extensions/extension_browser_event_router.h"

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

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

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

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

16 #include "chrome/browser/sessions/restore_tab_helper.h"	15 #include "chrome/browser/sessions/restore_tab_helper.h"

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

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

19 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"	18 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"

20 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"	19 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"

21 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"	20 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

(...skipping 834 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
856 if (profile_->IsOffTheRecord())	855 if (profile_->IsOffTheRecord())

857 index = toolbarModel_->IncognitoIndexToOriginal(index);	856 index = toolbarModel_->IncognitoIndexToOriginal(index);

858 if (index < toolbarModel_->size()) {	857 if (index < toolbarModel_->size()) {

859 const Extension* extension = toolbarModel_->GetExtensionByIndex(index);	858 const Extension* extension = toolbarModel_->GetExtensionByIndex(index);

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

861 }	860 }

862 return nil;	861 return nil;

863 }	862 }

864	863

865 @end	864 @end

OLD	NEW