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

Side by Side Diff: chrome/browser/apps/install_chrome_app.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/apps/install_chrome_app.h" 5 #include "chrome/browser/apps/install_chrome_app.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // At the moment InstallChromeApp() is called immediately after handling 80 // At the moment InstallChromeApp() is called immediately after handling
81 // startup URLs, so a browser is guaranteed to be created. If that changes we 81 // startup URLs, so a browser is guaranteed to be created. If that changes we
82 // may need to start a browser or browser session here. 82 // may need to start a browser or browser session here.
83 Browser* browser = 83 Browser* browser =
84 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->get(0); 84 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->get(0);
85 DCHECK(browser); 85 DCHECK(browser);
86 86
87 content::OpenURLParams params(GetAppInstallUrl(app_id), 87 content::OpenURLParams params(GetAppInstallUrl(app_id),
88 content::Referrer(), 88 content::Referrer(),
89 NEW_FOREGROUND_TAB, 89 NEW_FOREGROUND_TAB,
90 content::PAGE_TRANSITION_AUTO_TOPLEVEL, 90 ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
91 false); 91 false);
92 browser->OpenURL(params); 92 browser->OpenURL(params);
93 93
94 ExtensionRegistry* registry = ExtensionRegistry::Get(browser->profile()); 94 ExtensionRegistry* registry = ExtensionRegistry::Get(browser->profile());
95 // Skip if this app is already installed or blacklisted. For disabled or 95 // Skip if this app is already installed or blacklisted. For disabled or
96 // or terminated apps, going through the installation flow should re-enable 96 // or terminated apps, going through the installation flow should re-enable
97 // them. 97 // them.
98 const extensions::Extension* installed_extension = registry->GetExtensionById( 98 const extensions::Extension* installed_extension = registry->GetExtensionById(
99 app_id, ExtensionRegistry::ENABLED | ExtensionRegistry::BLACKLISTED); 99 app_id, ExtensionRegistry::ENABLED | ExtensionRegistry::BLACKLISTED);
100 // TODO(jackhou): For installed apps, maybe we should do something better, 100 // TODO(jackhou): For installed apps, maybe we should do something better,
101 // e.g. show the app list (and re-add it to the taskbar). 101 // e.g. show the app list (and re-add it to the taskbar).
102 if (installed_extension) 102 if (installed_extension)
103 return; 103 return;
104 104
105 WebstoreInstallWithPromptAppsOnly* installer = 105 WebstoreInstallWithPromptAppsOnly* installer =
106 new WebstoreInstallWithPromptAppsOnly( 106 new WebstoreInstallWithPromptAppsOnly(
107 app_id, browser->profile(), browser->window()->GetNativeWindow()); 107 app_id, browser->profile(), browser->window()->GetNativeWindow());
108 installer->BeginInstall(); 108 installer->BeginInstall();
109 } 109 }
110 110
111 } // namespace install_chrome_app 111 } // namespace install_chrome_app
OLDNEW
« no previous file with comments | « chrome/browser/apps/ephemeral_app_launcher.cc ('k') | chrome/browser/autocomplete/autocomplete_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698