chrome/browser/extensions/extension_dom_ui.cc - Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3].

Side by Side Diff: chrome/browser/extensions/extension_dom_ui.cc

Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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

« chrome/browser/extensions/browser_action_test_util_views.cc ('K') | « chrome/browser/extensions/extension_devtools_browsertests.cc ('k') | chrome/browser/extensions/extension_host.cc » ('j') | chrome/browser/extensions/extension_popup_api.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6	6

7 #include <set>	7 #include <set>

8	8

9 #include "net/base/file_stream.h"	9 #include "net/base/file_stream.h"

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

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

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

13 #include "chrome/browser/browser_list.h"	12 #include "chrome/browser/browser_list.h"

14 #include "chrome/browser/browser_thread.h"	13 #include "chrome/browser/browser_thread.h"

15 #include "chrome/browser/extensions/extension_bookmark_manager_api.h"	14 #include "chrome/browser/extensions/extension_bookmark_manager_api.h"

16 #include "chrome/browser/extensions/extensions_service.h"	15 #include "chrome/browser/extensions/extensions_service.h"

17 #include "chrome/browser/extensions/image_loading_tracker.h"	16 #include "chrome/browser/extensions/image_loading_tracker.h"

18 #include "chrome/browser/prefs/pref_service.h"	17 #include "chrome/browser/prefs/pref_service.h"

19 #include "chrome/browser/profile.h"	18 #include "chrome/browser/profile.h"

20 #include "chrome/browser/renderer_host/render_widget_host_view.h"	19 #include "chrome/browser/renderer_host/render_widget_host_view.h"

21 #include "chrome/browser/tab_contents/tab_contents.h"	20 #include "chrome/browser/tab_contents/tab_contents.h"

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

22 #include "chrome/common/bindings_policy.h"	22 #include "chrome/common/bindings_policy.h"

23 #include "chrome/common/chrome_switches.h"	23 #include "chrome/common/chrome_switches.h"

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

	25 #include "chrome/common/extensions/extension_constants.h"
	Lei Zhang 2010/11/16 20:01:28 same inconsistent ordering as page_action_apitest. same inconsistent ordering as page_action_apitest.cc James Hawkins 2010/11/16 20:43:29 Done. Show quoted text On 2010/11/16 20:01:28, Lei Zhang wrote: > same inconsistent ordering as page_action_apitest.cc Done.
25 #include "chrome/common/extensions/extension.h"	26 #include "chrome/common/extensions/extension.h"

26 #include "chrome/common/extensions/extension_constants.h"

27 #include "chrome/common/extensions/extension_icon_set.h"	27 #include "chrome/common/extensions/extension_icon_set.h"

28 #include "chrome/common/extensions/extension_resource.h"	28 #include "chrome/common/extensions/extension_resource.h"

29 #include "chrome/common/url_constants.h"	29 #include "chrome/common/url_constants.h"

30 #include "gfx/codec/png_codec.h"	30 #include "gfx/codec/png_codec.h"

31 #include "gfx/favicon_size.h"	31 #include "gfx/favicon_size.h"

32 #include "third_party/skia/include/core/SkBitmap.h"	32 #include "third_party/skia/include/core/SkBitmap.h"

33	33

34 namespace {	34 namespace {

35	35

36 // De-dupes the items in \|list\|. Assumes the values are strings.	36 // De-dupes the items in \|list\|. Assumes the values are strings.

(...skipping 365 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
402 }	402 }

403	403

404 // static	404 // static

405 void ExtensionDOMUI::GetFaviconForURL(Profile* profile,	405 void ExtensionDOMUI::GetFaviconForURL(Profile* profile,

406 FaviconService::GetFaviconRequest* request, const GURL& page_url) {	406 FaviconService::GetFaviconRequest* request, const GURL& page_url) {

407 // tracker deletes itself when done.	407 // tracker deletes itself when done.

408 ExtensionDOMUIImageLoadingTracker* tracker =	408 ExtensionDOMUIImageLoadingTracker* tracker =

409 new ExtensionDOMUIImageLoadingTracker(profile, request, page_url);	409 new ExtensionDOMUIImageLoadingTracker(profile, request, page_url);

410 tracker->Init();	410 tracker->Init();

411 }	411 }

OLD	NEW