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

Side by Side Diff: chrome/browser/browser_process_platform_part_aurawin.cc

Issue 498573003: Add relaunch into ASH and desktop support for Chrome on Windows 7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed menu strings to Chrome OS mode Created 6 years, 3 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/browser_process_platform_part_aurawin.h" 5 #include "chrome/browser/browser_process_platform_part_aurawin.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/process/kill.h" 10 #include "base/process/kill.h"
11 #include "base/win/windows_version.h" 11 #include "base/win/windows_version.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/first_run/upgrade_util.h" 14 #include "chrome/browser/first_run/upgrade_util.h"
15 #include "chrome/browser/first_run/upgrade_util_win.h" 15 #include "chrome/browser/first_run/upgrade_util_win.h"
16 #include "chrome/browser/lifetime/application_lifetime.h" 16 #include "chrome/browser/lifetime/application_lifetime.h"
17 #include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h " 17 #include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h "
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "content/public/browser/notification_service.h" 20 #include "content/public/browser/notification_service.h"
21 21
22 #include "ui/aura/remote_window_tree_host_win.h" 22 #include "ui/aura/remote_window_tree_host_win.h"
23 23
24 BrowserProcessPlatformPart::BrowserProcessPlatformPart() { 24 BrowserProcessPlatformPart::BrowserProcessPlatformPart() {
25 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { 25 if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
26 // Tell metro viewer to close when we are shutting down. 26 // Tell metro viewer to close when we are shutting down.
27 registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING, 27 registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
28 content::NotificationService::AllSources()); 28 content::NotificationService::AllSources());
29 } 29 }
30 } 30 }
31 31
32 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() { 32 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
33 } 33 }
34 34
35 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() { 35 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 if (mode == upgrade_util::RELAUNCH_MODE_DESKTOP) { 74 if (mode == upgrade_util::RELAUNCH_MODE_DESKTOP) {
75 // Metro -> Desktop 75 // Metro -> Desktop
76 chrome::ActivateDesktopHelper(chrome::ASH_TERMINATE); 76 chrome::ActivateDesktopHelper(chrome::ASH_TERMINATE);
77 } else { 77 } else {
78 // Metro -> Metro 78 // Metro -> Metro
79 ChromeMetroViewerProcessHost::HandleMetroExit(); 79 ChromeMetroViewerProcessHost::HandleMetroExit();
80 } 80 }
81 } 81 }
82 } 82 }
83 } 83 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698