chrome/browser/views/browser_actions_container.cc - Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/.

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

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 9 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/views/bookmark_table_view.cc ('k') | chrome/browser/views/bubble_border.cc » ('j') | no next file with comments »

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 #include "chrome/browser/views/browser_actions_container.h"	5 #include "chrome/browser/views/browser_actions_container.h"

6	6

7 #include "app/gfx/canvas.h"

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

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

10 #include "app/slide_animation.h"	9 #include "app/slide_animation.h"

11 #include "base/stl_util-inl.h"	10 #include "base/stl_util-inl.h"

12 #include "base/string_util.h"	11 #include "base/string_util.h"

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

14 #include "chrome/browser/browser_theme_provider.h"	13 #include "chrome/browser/browser_theme_provider.h"

15 #include "chrome/browser/browser_window.h"	14 #include "chrome/browser/browser_window.h"

16 #include "chrome/browser/extensions/extension_browser_event_router.h"	15 #include "chrome/browser/extensions/extension_browser_event_router.h"

17 #include "chrome/browser/extensions/extension_host.h"	16 #include "chrome/browser/extensions/extension_host.h"

18 #include "chrome/browser/extensions/extensions_service.h"	17 #include "chrome/browser/extensions/extensions_service.h"

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

20 #include "chrome/browser/renderer_host/render_widget_host_view.h"	19 #include "chrome/browser/renderer_host/render_widget_host_view.h"

21 #include "chrome/browser/renderer_host/render_view_host.h"	20 #include "chrome/browser/renderer_host/render_view_host.h"

22 #include "chrome/browser/profile.h"	21 #include "chrome/browser/profile.h"

23 #include "chrome/browser/tab_contents/tab_contents.h"	22 #include "chrome/browser/tab_contents/tab_contents.h"

24 #include "chrome/browser/view_ids.h"	23 #include "chrome/browser/view_ids.h"

25 #include "chrome/browser/views/detachable_toolbar_view.h"	24 #include "chrome/browser/views/detachable_toolbar_view.h"

26 #include "chrome/browser/views/extensions/browser_action_drag_data.h"	25 #include "chrome/browser/views/extensions/browser_action_drag_data.h"

27 #include "chrome/browser/views/extensions/extension_popup.h"	26 #include "chrome/browser/views/extensions/extension_popup.h"

28 #include "chrome/common/notification_source.h"	27 #include "chrome/common/notification_source.h"

29 #include "chrome/common/notification_type.h"	28 #include "chrome/common/notification_type.h"

30 #include "chrome/common/pref_names.h"	29 #include "chrome/common/pref_names.h"

	30 #include "gfx/canvas.h"

31 #include "grit/app_resources.h"	31 #include "grit/app_resources.h"

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

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

34 #include "third_party/skia/include/core/SkTypeface.h"	34 #include "third_party/skia/include/core/SkTypeface.h"

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

36 #include "views/controls/button/menu_button.h"	36 #include "views/controls/button/menu_button.h"

37 #include "views/controls/button/text_button.h"	37 #include "views/controls/button/text_button.h"

38 #include "views/controls/menu/menu_2.h"	38 #include "views/controls/menu/menu_2.h"

39 #include "views/drag_utils.h"	39 #include "views/drag_utils.h"

40 #include "views/window/window.h"	40 #include "views/window/window.h"

(...skipping 1083 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1124 popup_ = NULL;	1124 popup_ = NULL;

1125 popup_button_->SetButtonNotPushed();	1125 popup_button_->SetButtonNotPushed();

1126 popup_button_ = NULL;	1126 popup_button_ = NULL;

1127 }	1127 }

1128	1128

1129 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {	1129 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {

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

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

1132 profile_->GetExtensionsService()->IsIncognitoEnabled(extension));	1132 profile_->GetExtensionsService()->IsIncognitoEnabled(extension));

1133 }	1133 }

OLD	NEW