chrome/browser/ui/views/browser_actions_container.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

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/views/browser_actions_container.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/views/browser_actions_container.h"	5 #include "chrome/browser/ui/views/browser_actions_container.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

9 #include "base/stl_util-inl.h"	9 #include "base/stl_util-inl.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "chrome/browser/browser_window.h"	12 #include "chrome/browser/browser_window.h"

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

14 #include "chrome/browser/extensions/extension_host.h"	14 #include "chrome/browser/extensions/extension_host.h"

15 #include "chrome/browser/extensions/extension_tabs_module.h"	15 #include "chrome/browser/extensions/extension_tabs_module.h"

(...skipping 1078 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1094 AnimationEnded(resize_animation_.get());	1094 AnimationEnded(resize_animation_.get());

1095 }	1095 }

1096 }	1096 }

1097	1097

1098 bool BrowserActionsContainer::ShouldDisplayBrowserAction(	1098 bool BrowserActionsContainer::ShouldDisplayBrowserAction(

1099 const Extension* extension) {	1099 const Extension* extension) {

1100 // Only display incognito-enabled extensions while in incognito mode.	1100 // Only display incognito-enabled extensions while in incognito mode.

1101 return (!profile_->IsOffTheRecord() \|\|	1101 return (!profile_->IsOffTheRecord() \|\|

1102 profile_->GetExtensionService()->IsIncognitoEnabled(extension));	1102 profile_->GetExtensionService()->IsIncognitoEnabled(extension));

1103 }	1103 }

OLD	NEW