Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
OLDNEW
1 // Copyright (c) 2011 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/ui/views/browser_actions_container.h" 5 #include "chrome/browser/ui/views/browser_actions_container.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util-inl.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/browser_window.h" 10 #include "chrome/browser/browser_window.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/ui/view_ids.h" 21 #include "chrome/browser/ui/view_ids.h"
22 #include "chrome/browser/ui/views/detachable_toolbar_view.h" 22 #include "chrome/browser/ui/views/detachable_toolbar_view.h"
23 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" 23 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
24 #include "chrome/browser/ui/views/extensions/extension_popup.h" 24 #include "chrome/browser/ui/views/extensions/extension_popup.h"
25 #include "chrome/browser/ui/views/toolbar_view.h" 25 #include "chrome/browser/ui/views/toolbar_view.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/notification_source.h" 28 #include "chrome/common/notification_source.h"
29 #include "chrome/common/notification_type.h" 29 #include "chrome/common/notification_type.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "gfx/canvas.h"
32 #include "gfx/canvas_skia.h"
33 #include "grit/app_resources.h" 31 #include "grit/app_resources.h"
34 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
35 #include "third_party/skia/include/core/SkBitmap.h" 33 #include "third_party/skia/include/core/SkBitmap.h"
36 #include "third_party/skia/include/core/SkTypeface.h" 34 #include "third_party/skia/include/core/SkTypeface.h"
37 #include "third_party/skia/include/effects/SkGradientShader.h" 35 #include "third_party/skia/include/effects/SkGradientShader.h"
38 #include "ui/base/animation/slide_animation.h" 36 #include "ui/base/animation/slide_animation.h"
39 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
40 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
39 #include "ui/gfx/canvas.h"
40 #include "ui/gfx/canvas_skia.h"
41 #include "views/controls/button/menu_button.h" 41 #include "views/controls/button/menu_button.h"
42 #include "views/controls/button/text_button.h" 42 #include "views/controls/button/text_button.h"
43 #include "views/controls/menu/menu_2.h" 43 #include "views/controls/menu/menu_2.h"
44 #include "views/drag_utils.h" 44 #include "views/drag_utils.h"
45 #include "views/window/window.h" 45 #include "views/window/window.h"
46 46
47 #include "grit/theme_resources.h" 47 #include "grit/theme_resources.h"
48 48
49 // Horizontal spacing between most items in the container, as well as after the 49 // Horizontal spacing between most items in the container, as well as after the
50 // last item or chevron (if visible). 50 // last item or chevron (if visible).
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 AnimationEnded(resize_animation_.get()); 1097 AnimationEnded(resize_animation_.get());
1098 } 1098 }
1099 } 1099 }
1100 1100
1101 bool BrowserActionsContainer::ShouldDisplayBrowserAction( 1101 bool BrowserActionsContainer::ShouldDisplayBrowserAction(
1102 const Extension* extension) { 1102 const Extension* extension) {
1103 // Only display incognito-enabled extensions while in incognito mode. 1103 // Only display incognito-enabled extensions while in incognito mode.
1104 return (!profile_->IsOffTheRecord() || 1104 return (!profile_->IsOffTheRecord() ||
1105 profile_->GetExtensionService()->IsIncognitoEnabled(extension)); 1105 profile_->GetExtensionService()->IsIncognitoEnabled(extension));
1106 } 1106 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmark_menu_controller_views.h ('k') | chrome/browser/ui/views/browser_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698