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

Side by Side Diff: chrome/browser/background/background_mode_manager_gtk.cc

Issue 9114020: Remove task.h and finish base::Bind() migration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 years, 11 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) 2011 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 "base/bind.h" 7 #include "base/bind.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"
15 #include "chrome/browser/background/background_mode_manager.h" 14 #include "chrome/browser/background/background_mode_manager.h"
16 #include "chrome/browser/shell_integration.h" 15 #include "chrome/browser/shell_integration.h"
17 #include "chrome/browser/ui/gtk/gtk_util.h" 16 #include "chrome/browser/ui/gtk/gtk_util.h"
18 #include "chrome/common/auto_start_linux.h" 17 #include "chrome/common/auto_start_linux.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/chrome_version_info.h" 19 #include "chrome/common/chrome_version_info.h"
21 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
22 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
24 23
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // TODO(atwilson): Display a platform-appropriate notification here. 75 // TODO(atwilson): Display a platform-appropriate notification here.
77 // http://crbug.com/74970 76 // http://crbug.com/74970
78 } 77 }
79 78
80 string16 BackgroundModeManager::GetPreferencesMenuLabel() { 79 string16 BackgroundModeManager::GetPreferencesMenuLabel() {
81 string16 result = gtk_util::GetStockPreferencesMenuLabel(); 80 string16 result = gtk_util::GetStockPreferencesMenuLabel();
82 if (!result.empty()) 81 if (!result.empty())
83 return result; 82 return result;
84 return l10n_util::GetStringUTF16(IDS_PREFERENCES); 83 return l10n_util::GetStringUTF16(IDS_PREFERENCES);
85 } 84 }
OLDNEW
« no previous file with comments | « chrome/browser/background/background_contents_service.h ('k') | chrome/browser/background/background_mode_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698