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

Side by Side Diff: chrome/browser/background/background_contents_service.cc

Issue 229813002: Move extensions manifest IconsHandler to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (icons-handler) Created 6 years, 8 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) 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 "chrome/browser/background/background_contents_service.h" 5 #include "chrome/browser/background/background_contents_service.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/notifications/notification_delegate.h" 26 #include "chrome/browser/notifications/notification_delegate.h"
27 #include "chrome/browser/notifications/notification_ui_manager.h" 27 #include "chrome/browser/notifications/notification_ui_manager.h"
28 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/profiles/profile_manager.h" 29 #include "chrome/browser/profiles/profile_manager.h"
30 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
31 #include "chrome/browser/ui/browser_finder.h" 31 #include "chrome/browser/ui/browser_finder.h"
32 #include "chrome/browser/ui/browser_tabstrip.h" 32 #include "chrome/browser/ui/browser_tabstrip.h"
33 #include "chrome/browser/ui/host_desktop.h" 33 #include "chrome/browser/ui/host_desktop.h"
34 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
35 #include "chrome/common/extensions/extension_constants.h" 35 #include "chrome/common/extensions/extension_constants.h"
36 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
37 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
38 #include "content/public/browser/notification_service.h" 37 #include "content/public/browser/notification_service.h"
39 #include "content/public/browser/site_instance.h" 38 #include "content/public/browser/site_instance.h"
40 #include "content/public/browser/web_contents.h" 39 #include "content/public/browser/web_contents.h"
41 #include "extensions/browser/extension_host.h" 40 #include "extensions/browser/extension_host.h"
42 #include "extensions/browser/extension_registry.h" 41 #include "extensions/browser/extension_registry.h"
43 #include "extensions/browser/extension_system.h" 42 #include "extensions/browser/extension_system.h"
44 #include "extensions/common/extension.h" 43 #include "extensions/common/extension.h"
45 #include "extensions/common/extension_icon_set.h" 44 #include "extensions/common/extension_icon_set.h"
46 #include "extensions/common/extension_set.h" 45 #include "extensions/common/extension_set.h"
47 #include "extensions/common/manifest_handlers/background_info.h" 46 #include "extensions/common/manifest_handlers/background_info.h"
47 #include "extensions/common/manifest_handlers/icons_handler.h"
48 #include "grit/generated_resources.h" 48 #include "grit/generated_resources.h"
49 #include "grit/theme_resources.h" 49 #include "grit/theme_resources.h"
50 #include "ipc/ipc_message.h" 50 #include "ipc/ipc_message.h"
51 #include "ui/base/l10n/l10n_util.h" 51 #include "ui/base/l10n/l10n_util.h"
52 #include "ui/base/resource/resource_bundle.h" 52 #include "ui/base/resource/resource_bundle.h"
53 #include "ui/gfx/image/image.h" 53 #include "ui/gfx/image/image.h"
54 54
55 #if defined(ENABLE_NOTIFICATIONS) 55 #if defined(ENABLE_NOTIFICATIONS)
56 #include "ui/message_center/message_center.h" 56 #include "ui/message_center/message_center.h"
57 #include "ui/message_center/message_center_util.h" 57 #include "ui/message_center/message_center_util.h"
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 bool user_gesture, 786 bool user_gesture,
787 bool* was_blocked) { 787 bool* was_blocked) {
788 Browser* browser = chrome::FindLastActiveWithProfile( 788 Browser* browser = chrome::FindLastActiveWithProfile(
789 Profile::FromBrowserContext(new_contents->GetBrowserContext()), 789 Profile::FromBrowserContext(new_contents->GetBrowserContext()),
790 chrome::GetActiveDesktop()); 790 chrome::GetActiveDesktop());
791 if (browser) { 791 if (browser) {
792 chrome::AddWebContents(browser, NULL, new_contents, disposition, 792 chrome::AddWebContents(browser, NULL, new_contents, disposition,
793 initial_pos, user_gesture, was_blocked); 793 initial_pos, user_gesture, was_blocked);
794 } 794 }
795 } 795 }
OLDNEW
« no previous file with comments | « chrome/browser/background/background_application_list_model.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698