summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background
diff options
context:
space:
mode:
authorbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-17 00:28:56 +0000
committerbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-17 00:28:56 +0000
commit98566d7a0f5396b4fda4863b4036bed441316b2f (patch)
tree82d05238c2619f8a1f75a88fe68da23581e90fa2 /chrome/browser/background
parentab1c2c816b1f08b56f539a172f4c0b2e2004168d (diff)
downloadchromium_src-98566d7a0f5396b4fda4863b4036bed441316b2f.zip
chromium_src-98566d7a0f5396b4fda4863b4036bed441316b2f.tar.gz
chromium_src-98566d7a0f5396b4fda4863b4036bed441316b2f.tar.bz2
Moved Linux specific shell integration declarations into own header.
This continues refactoring started in http://codereview.chromium.org/9958006/ BUG=None TEST=Refactor; covered by existing tests Review URL: http://codereview.chromium.org/10097004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
-rw-r--r--chrome/browser/background/background_mode_manager_gtk.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/background/background_mode_manager_gtk.cc b/chrome/browser/background/background_mode_manager_gtk.cc
index 26f2b1e..890b437 100644
--- a/chrome/browser/background/background_mode_manager_gtk.cc
+++ b/chrome/browser/background/background_mode_manager_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/nix/xdg_util.h"
#include "chrome/browser/background/background_mode_manager.h"
-#include "chrome/browser/shell_integration.h"
+#include "chrome/browser/shell_integration_linux.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/common/auto_start_linux.h"
#include "chrome/common/chrome_switches.h"
@@ -40,7 +40,7 @@ void EnableLaunchOnStartupCallback() {
std::string command_line = wrapper_script +
" --" + switches::kNoStartupWindow;
if (!AutoStart::AddApplication(
- ShellIntegration::GetDesktopName(environment.get()),
+ ShellIntegrationLinux::GetDesktopName(environment.get()),
version_info->Name(),
command_line,
false)) {
@@ -50,7 +50,8 @@ void EnableLaunchOnStartupCallback() {
void DisableLaunchOnStartupCallback() {
scoped_ptr<base::Environment> environment(base::Environment::Create());
- if (!AutoStart::Remove(ShellIntegration::GetDesktopName(environment.get()))) {
+ if (!AutoStart::Remove(
+ ShellIntegrationLinux::GetDesktopName(environment.get()))) {
NOTREACHED() << "Failed to deregister launch on login.";
}
}