| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <unistd.h> | 5 #include <unistd.h> |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| 11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/nix/xdg_util.h" | 13 #include "base/nix/xdg_util.h" |
| 14 #include "base/task.h" | 14 #include "base/task.h" |
| 15 #include "chrome/browser/background_mode_manager.h" | 15 #include "chrome/browser/background_mode_manager.h" |
| 16 #include "chrome/browser/browser_thread.h" | 16 #include "chrome/browser/browser_thread.h" |
| 17 #include "chrome/browser/gtk/gtk_util.h" | |
| 18 #include "chrome/browser/shell_integration.h" | 17 #include "chrome/browser/shell_integration.h" |
| 18 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/chrome_version_info.h" | 20 #include "chrome/common/chrome_version_info.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 class DisableLaunchOnStartupTask : public Task { | 25 class DisableLaunchOnStartupTask : public Task { |
| 26 public: | 26 public: |
| 27 virtual void Run(); | 27 virtual void Run(); |
| 28 }; | 28 }; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 file_util::Delete(GetAutostartFilename(environment.get()), false); | 105 file_util::Delete(GetAutostartFilename(environment.get()), false); |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 | 108 |
| 109 string16 BackgroundModeManager::GetPreferencesMenuLabel() { | 109 string16 BackgroundModeManager::GetPreferencesMenuLabel() { |
| 110 string16 result = gtk_util::GetStockPreferencesMenuLabel(); | 110 string16 result = gtk_util::GetStockPreferencesMenuLabel(); |
| 111 if (!result.empty()) | 111 if (!result.empty()) |
| 112 return result; | 112 return result; |
| 113 return l10n_util::GetStringUTF16(IDS_PREFERENCES); | 113 return l10n_util::GetStringUTF16(IDS_PREFERENCES); |
| 114 } | 114 } |
| OLD | NEW |