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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h"
9 #include "base/stl_util-inl.h" 8 #include "base/stl_util-inl.h"
10 #include "base/string_util.h" 9 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/browser_window.h" 11 #include "chrome/browser/browser_window.h"
13 #include "chrome/browser/extensions/extension_browser_event_router.h" 12 #include "chrome/browser/extensions/extension_browser_event_router.h"
14 #include "chrome/browser/extensions/extension_host.h" 13 #include "chrome/browser/extensions/extension_host.h"
15 #include "chrome/browser/extensions/extension_tabs_module.h" 14 #include "chrome/browser/extensions/extension_tabs_module.h"
16 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/renderer_host/render_view_host.h" 17 #include "chrome/browser/renderer_host/render_view_host.h"
(...skipping 12 matching lines...) Expand all
31 #include "chrome/common/notification_type.h" 30 #include "chrome/common/notification_type.h"
32 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
33 #include "gfx/canvas.h" 32 #include "gfx/canvas.h"
34 #include "gfx/canvas_skia.h" 33 #include "gfx/canvas_skia.h"
35 #include "grit/app_resources.h" 34 #include "grit/app_resources.h"
36 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
37 #include "third_party/skia/include/core/SkBitmap.h" 36 #include "third_party/skia/include/core/SkBitmap.h"
38 #include "third_party/skia/include/core/SkTypeface.h" 37 #include "third_party/skia/include/core/SkTypeface.h"
39 #include "third_party/skia/include/effects/SkGradientShader.h" 38 #include "third_party/skia/include/effects/SkGradientShader.h"
40 #include "ui/base/animation/slide_animation.h" 39 #include "ui/base/animation/slide_animation.h"
40 #include "ui/base/resource/resource_bundle.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 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmark_menu_controller_views.cc ('k') | chrome/browser/ui/views/bubble_border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698