chrome/browser/ui/extensions/extension_action_view_controller.cc - Issue 1472863004: [MD] re-skin extension browser action badges

Side by Side Diff: chrome/browser/ui/extensions/extension_action_view_controller.cc

Issue 1472863004: [MD] re-skin extension browser action badges (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android, take 2 Created 5 years 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

« no previous file with comments | « no previous file | chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc » ('j') | chrome/browser/ui/extensions/icon_with_badge_image_source.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

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

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/browser/extensions/api/commands/command_service.h"	9 #include "chrome/browser/extensions/api/commands/command_service.h"

10 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"	10 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"

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

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

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

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

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

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

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

18 #include "chrome/browser/ui/extensions/accelerator_priority.h"	18 #include "chrome/browser/ui/extensions/accelerator_priority.h"

19 #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h"	19 #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h"

	20 #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h"

20 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"	21 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"

21 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"	22 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

22 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"	23 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

23 #include "chrome/common/extensions/api/extension_action/action_info.h"	24 #include "chrome/common/extensions/api/extension_action/action_info.h"

24 #include "chrome/common/icon_with_badge_image_source.h"

25 #include "extensions/browser/extension_host.h"	25 #include "extensions/browser/extension_host.h"

26 #include "extensions/browser/extension_registry.h"	26 #include "extensions/browser/extension_registry.h"

27 #include "extensions/common/extension.h"	27 #include "extensions/common/extension.h"

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

29 #include "extensions/common/manifest_constants.h"	29 #include "extensions/common/manifest_constants.h"

30 #include "ui/base/resource/material_design/material_design_controller.h"	30 #include "ui/base/resource/material_design/material_design_controller.h"

31 #include "ui/gfx/image/image_skia.h"	31 #include "ui/gfx/image/image_skia.h"

32 #include "ui/gfx/image/image_skia_operations.h"	32 #include "ui/gfx/image/image_skia_operations.h"

33	33

34 using extensions::ActionInfo;	34 using extensions::ActionInfo;

(...skipping 362 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397 // overflowed, we add a decoration so that the user can see which overflowed	397 // overflowed, we add a decoration so that the user can see which overflowed

398 // action wants to run (since they wouldn't be able to see the change from	398 // action wants to run (since they wouldn't be able to see the change from

399 // grayscale to color).	399 // grayscale to color).

400 bool is_overflow =	400 bool is_overflow =

401 toolbar_actions_bar_ && toolbar_actions_bar_->in_overflow_mode();	401 toolbar_actions_bar_ && toolbar_actions_bar_->in_overflow_mode();

402 image_source->set_paint_decoration(WantsToRun(web_contents) && is_overflow);	402 image_source->set_paint_decoration(WantsToRun(web_contents) && is_overflow);

403 }	403 }

404	404

405 return image_source.Pass();	405 return image_source.Pass();

406 }	406 }

OLD	NEW