extensions/browser/api/app_window/app_window_api.cc - Issue 782693002: Ensure there are always nice icons for bookmark apps.

Side by Side Diff: extensions/browser/api/app_window/app_window_api.cc

Issue 782693002: Ensure there are always nice icons for bookmark apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Self review; test Created 6 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

« chrome/common/extensions/manifest_handlers/app_icon_color_info.cc ('K') | « extensions/browser/DEPS ('k') | extensions/browser/image_util.h » ('j') | extensions/common/image_util.cc » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "extensions/browser/api/app_window/app_window_api.h"	5 #include "extensions/browser/api/app_window/app_window_api.h"

6	6

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

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

9 #include "base/strings/string_util.h"	9 #include "base/strings/string_util.h"

10 #include "base/time/time.h"	10 #include "base/time/time.h"

11 #include "base/values.h"	11 #include "base/values.h"

12 #include "content/public/browser/notification_registrar.h"	12 #include "content/public/browser/notification_registrar.h"

13 #include "content/public/browser/notification_types.h"	13 #include "content/public/browser/notification_types.h"

14 #include "content/public/browser/render_process_host.h"	14 #include "content/public/browser/render_process_host.h"

15 #include "content/public/browser/render_view_host.h"	15 #include "content/public/browser/render_view_host.h"

16 #include "content/public/browser/web_contents.h"	16 #include "content/public/browser/web_contents.h"

17 #include "content/public/common/url_constants.h"	17 #include "content/public/common/url_constants.h"

18 #include "extensions/browser/app_window/app_window.h"	18 #include "extensions/browser/app_window/app_window.h"

19 #include "extensions/browser/app_window/app_window_client.h"	19 #include "extensions/browser/app_window/app_window_client.h"

20 #include "extensions/browser/app_window/app_window_contents.h"	20 #include "extensions/browser/app_window/app_window_contents.h"

21 #include "extensions/browser/app_window/app_window_registry.h"	21 #include "extensions/browser/app_window/app_window_registry.h"

22 #include "extensions/browser/app_window/native_app_window.h"	22 #include "extensions/browser/app_window/native_app_window.h"

23 #include "extensions/browser/extensions_browser_client.h"	23 #include "extensions/browser/extensions_browser_client.h"

24 #include "extensions/browser/image_util.h"

25 #include "extensions/common/api/app_window.h"	24 #include "extensions/common/api/app_window.h"

26 #include "extensions/common/features/simple_feature.h"	25 #include "extensions/common/features/simple_feature.h"

	26 #include "extensions/common/image_util.h"

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

28 #include "extensions/common/permissions/permissions_data.h"	28 #include "extensions/common/permissions/permissions_data.h"

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

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

31 #include "ui/base/ui_base_types.h"	31 #include "ui/base/ui_base_types.h"

32 #include "ui/gfx/rect.h"	32 #include "ui/gfx/rect.h"

33 #include "url/gurl.h"	33 #include "url/gurl.h"

34	34

35 namespace app_window = extensions::core_api::app_window;	35 namespace app_window = extensions::core_api::app_window;

36 namespace Create = app_window::Create;	36 namespace Create = app_window::Create;

(...skipping 512 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
549	549

550 if (options.frame->as_frame_options->inactive_color.get()) {	550 if (options.frame->as_frame_options->inactive_color.get()) {

551 error_ = app_window_constants::kInactiveColorWithoutColor;	551 error_ = app_window_constants::kInactiveColorWithoutColor;

552 return false;	552 return false;

553 }	553 }

554	554

555 return true;	555 return true;

556 }	556 }

557	557

558 } // namespace extensions	558 } // namespace extensions

OLD	NEW