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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 25034003: Moved apps metro code from apps to chrome/browser/apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix unit test Created 7 years, 2 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/ui/startup/startup_browser_creator_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_restore_service.h" 10 #include "apps/app_restore_service.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #if defined(OS_MACOSX) 96 #if defined(OS_MACOSX)
97 #include "base/mac/mac_util.h" 97 #include "base/mac/mac_util.h"
98 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h" 98 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h"
99 #endif 99 #endif
100 100
101 #if defined(TOOLKIT_GTK) 101 #if defined(TOOLKIT_GTK)
102 #include "chrome/browser/ui/gtk/gtk_util.h" 102 #include "chrome/browser/ui/gtk/gtk_util.h"
103 #endif 103 #endif
104 104
105 #if defined(OS_WIN) 105 #if defined(OS_WIN)
106 #include "apps/app_launch_for_metro_restart_win.h"
107 #include "base/win/windows_version.h" 106 #include "base/win/windows_version.h"
107 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
108 #endif 108 #endif
109 109
110 using content::ChildProcessSecurityPolicy; 110 using content::ChildProcessSecurityPolicy;
111 using content::WebContents; 111 using content::WebContents;
112 using extensions::Extension; 112 using extensions::Extension;
113 113
114 namespace { 114 namespace {
115 115
116 // Utility functions ---------------------------------------------------------- 116 // Utility functions ----------------------------------------------------------
117 117
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 command_line_.HasSwitch(switches::kNoStartupWindow) && 578 command_line_.HasSwitch(switches::kNoStartupWindow) &&
579 !command_line_.HasSwitch(switches::kAutoLaunchAtStartup)) { 579 !command_line_.HasSwitch(switches::kAutoLaunchAtStartup)) {
580 return; 580 return;
581 } 581 }
582 582
583 // TODO(tapted): Move this to startup_browser_creator_win.cc after refactor. 583 // TODO(tapted): Move this to startup_browser_creator_win.cc after refactor.
584 #if defined(OS_WIN) 584 #if defined(OS_WIN)
585 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { 585 if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
586 // See if there are apps for this profile that should be launched on startup 586 // See if there are apps for this profile that should be launched on startup
587 // due to a switch from Metro mode. 587 // due to a switch from Metro mode.
588 apps::HandleAppLaunchForMetroRestart(profile_); 588 app_metro_launch::HandleAppLaunchForMetroRestart(profile_);
589 } 589 }
590 #endif 590 #endif
591 591
592 if (process_startup && ProcessStartupURLs(urls_to_open, desktop_type)) { 592 if (process_startup && ProcessStartupURLs(urls_to_open, desktop_type)) {
593 // ProcessStartupURLs processed the urls, nothing else to do. 593 // ProcessStartupURLs processed the urls, nothing else to do.
594 return; 594 return;
595 } 595 }
596 596
597 chrome::startup::IsProcessStartup is_process_startup = process_startup ? 597 chrome::startup::IsProcessStartup is_process_startup = process_startup ?
598 chrome::startup::IS_PROCESS_STARTUP : 598 chrome::startup::IS_PROCESS_STARTUP :
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 } 985 }
986 986
987 #if !defined(OS_WIN) 987 #if !defined(OS_WIN)
988 // static 988 // static
989 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 989 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
990 Profile* profile, 990 Profile* profile,
991 const std::vector<GURL>& startup_urls) { 991 const std::vector<GURL>& startup_urls) {
992 return false; 992 return false;
993 } 993 }
994 #endif 994 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/apps/app_metro_infobar_delegate_win.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698