chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 166573005: Rename apps::ShellWindow to apps::AppWindow

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix more shell and Shell refs 2 Created 6 years, 10 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/apps/app_browsertest.cc ('K') | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/apps/apps_metro_handler_win.cc » ('j') | chrome/browser/ui/apps/chrome_shell_window_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

index c62bef01d2dc97dcf1f280322c5f9af876c9e264..887fae684f08097eb87c4cc1a07c5a90474d9a76 100644

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -7,7 +7,7 @@

#include "apps/app_keep_alive_service_factory.h"

#include "apps/app_load_service_factory.h"

#include "apps/app_restore_service_factory.h"

-#include "apps/shell_window_geometry_cache.h"

+#include "apps/app_window_geometry_cache.h"

#include "chrome/browser/apps/ephemeral_app_service_factory.h"

#include "chrome/browser/apps/shortcut_manager_factory.h"

#include "chrome/browser/autofill/personal_data_manager_factory.h"

@@ -146,10 +146,10 @@

#endif

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"

#include "chrome/browser/chromeos/extensions/input_method_api.h"

#include "chrome/browser/chromeos/extensions/media_player_api.h"

#include "chrome/browser/chromeos/extensions/screenlock_private_api.h"

-#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"

#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"

#include "chrome/browser/extensions/api/log_private/log_private_api.h"

#endif

@@ -240,7 +240,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

AppShortcutManagerFactory::GetInstance();

apps::AppLoadServiceFactory::GetInstance();

apps::AppRestoreServiceFactory::GetInstance();

- apps::ShellWindowGeometryCache::Factory::GetInstance();

+ apps::AppWindowGeometryCache::Factory::GetInstance();

EphemeralAppServiceFactory::GetInstance();

extensions::ActivityLogFactory::GetInstance();

extensions::ActivityLogAPI::GetFactoryInstance();