chrome/browser/ui/views/browser_actions_container.cc - Issue 9420007: Move RenderWidgetHostView into content namespace. Fix include paths.

Side by Side Diff: chrome/browser/ui/views/browser_actions_container.cc

Issue 9420007: Move RenderWidgetHostView into content namespace. Fix include paths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix linux_chromeos_gtk build issue not caught by trybots. Created 8 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/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/extensions/extension_dialog.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/ui/views/browser_actions_container.h"	5 #include "chrome/browser/ui/views/browser_actions_container.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/stl_util.h"	8 #include "base/stl_util.h"

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

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

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

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

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

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

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

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

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

18 #include "chrome/browser/ui/browser_window.h"	18 #include "chrome/browser/ui/browser_window.h"

19 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	19 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

20 #include "chrome/browser/ui/view_ids.h"	20 #include "chrome/browser/ui/view_ids.h"

21 #include "chrome/browser/ui/views/detachable_toolbar_view.h"	21 #include "chrome/browser/ui/views/detachable_toolbar_view.h"

22 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"	22 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

23 #include "chrome/browser/ui/views/extensions/extension_popup.h"	23 #include "chrome/browser/ui/views/extensions/extension_popup.h"

24 #include "chrome/browser/ui/views/toolbar_view.h"	24 #include "chrome/browser/ui/views/toolbar_view.h"

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

26 #include "chrome/common/extensions/extension_action.h"	26 #include "chrome/common/extensions/extension_action.h"

27 #include "chrome/common/extensions/extension_resource.h"	27 #include "chrome/common/extensions/extension_resource.h"

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

29 #include "content/browser/renderer_host/render_view_host.h"	29 #include "content/browser/renderer_host/render_view_host.h"

30 #include "content/browser/renderer_host/render_widget_host_view.h"

31 #include "content/public/browser/notification_source.h"	30 #include "content/public/browser/notification_source.h"

	31 #include "content/public/browser/render_widget_host_view.h"

32 #include "grit/generated_resources.h"	32 #include "grit/generated_resources.h"

33 #include "grit/theme_resources.h"	33 #include "grit/theme_resources.h"

34 #include "grit/theme_resources_standard.h"	34 #include "grit/theme_resources_standard.h"

35 #include "grit/ui_resources.h"	35 #include "grit/ui_resources.h"

36 #include "third_party/skia/include/core/SkBitmap.h"	36 #include "third_party/skia/include/core/SkBitmap.h"

37 #include "third_party/skia/include/effects/SkGradientShader.h"	37 #include "third_party/skia/include/effects/SkGradientShader.h"

38 #include "ui/base/accessibility/accessible_view_state.h"	38 #include "ui/base/accessibility/accessible_view_state.h"

39 #include "ui/base/animation/slide_animation.h"	39 #include "ui/base/animation/slide_animation.h"

40 #include "ui/base/l10n/l10n_util.h"	40 #include "ui/base/l10n/l10n_util.h"

41 #include "ui/base/resource/resource_bundle.h"	41 #include "ui/base/resource/resource_bundle.h"

(...skipping 1052 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1094 }	1094 }

1095 }	1095 }

1096	1096

1097 bool BrowserActionsContainer::ShouldDisplayBrowserAction(	1097 bool BrowserActionsContainer::ShouldDisplayBrowserAction(

1098 const Extension* extension) {	1098 const Extension* extension) {

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

1100 return	1100 return

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

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

1103 }	1103 }

OLD	NEW