chrome/browser/ui/views/toolbar/browser_actions_container.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 3 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/toolbar/browser_action_view.cc ('k') | chrome/browser/ui/views/toolbar/reload_button.cc » ('j') | no next file with comments »

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

6	6

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

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

9 #include "chrome/browser/extensions/extension_action_manager.h"	9 #include "chrome/browser/extensions/extension_action_manager.h"

10 #include "chrome/browser/extensions/extension_util.h"	10 #include "chrome/browser/extensions/extension_util.h"

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

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

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

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

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

16 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

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

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

19 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"	19 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h"

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

21 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"	21 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"

22 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"	22 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"

23 #include "chrome/common/extensions/command.h"	23 #include "chrome/common/extensions/command.h"

	24 #include "chrome/grit/generated_resources.h"

24 #include "extensions/browser/extension_registry.h"	25 #include "extensions/browser/extension_registry.h"

25 #include "extensions/browser/extension_system.h"	26 #include "extensions/browser/extension_system.h"

26 #include "extensions/browser/runtime_data.h"	27 #include "extensions/browser/runtime_data.h"

27 #include "extensions/common/feature_switch.h"	28 #include "extensions/common/feature_switch.h"

28 #include "grit/generated_resources.h"

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

30 #include "third_party/skia/include/core/SkColor.h"	30 #include "third_party/skia/include/core/SkColor.h"

31 #include "ui/accessibility/ax_view_state.h"	31 #include "ui/accessibility/ax_view_state.h"

32 #include "ui/base/dragdrop/drag_utils.h"	32 #include "ui/base/dragdrop/drag_utils.h"

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

34 #include "ui/base/nine_image_painter_factory.h"	34 #include "ui/base/nine_image_painter_factory.h"

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

36 #include "ui/base/theme_provider.h"	36 #include "ui/base/theme_provider.h"

37 #include "ui/gfx/animation/slide_animation.h"	37 #include "ui/gfx/animation/slide_animation.h"

38 #include "ui/gfx/canvas.h"	38 #include "ui/gfx/canvas.h"

(...skipping 1061 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1100 size_t absolute_model_size =	1100 size_t absolute_model_size =

1101 model_size == -1 ? extensions.size() : model_size;	1101 model_size == -1 ? extensions.size() : model_size;

1102	1102

1103 // The main container will try to show \|model_size\| icons, but reduce if there	1103 // The main container will try to show \|model_size\| icons, but reduce if there

1104 // aren't enough displayable icons to do so.	1104 // aren't enough displayable icons to do so.

1105 size_t main_displayed = std::min(displayable_icon_count, absolute_model_size);	1105 size_t main_displayed = std::min(displayable_icon_count, absolute_model_size);

1106 // The overflow will display the extras, if any.	1106 // The overflow will display the extras, if any.

1107 return in_overflow_mode() ?	1107 return in_overflow_mode() ?

1108 displayable_icon_count - main_displayed : main_displayed;	1108 displayable_icon_count - main_displayed : main_displayed;

1109 }	1109 }

OLD	NEW