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

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

Issue 6594063: Update a bunch of files to the new location of browser_thread.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/nix/xdg_util.h" 12 #include "base/nix/xdg_util.h"
13 #include "base/task.h" 13 #include "base/task.h"
14 #include "chrome/browser/background_mode_manager.h" 14 #include "chrome/browser/background_mode_manager.h"
15 #include "chrome/browser/browser_thread.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"
20 #include "content/browser/browser_thread.h"b
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 23
24 namespace { 24 namespace {
25 25
26 class DisableLaunchOnStartupTask : public Task { 26 class DisableLaunchOnStartupTask : public Task {
27 public: 27 public:
28 virtual void Run(); 28 virtual void Run();
29 }; 29 };
30 30
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 NOTREACHED() << "Failed to register launch on login."; 77 NOTREACHED() << "Failed to register launch on login.";
78 } 78 }
79 } 79 }
80 80
81 string16 BackgroundModeManager::GetPreferencesMenuLabel() { 81 string16 BackgroundModeManager::GetPreferencesMenuLabel() {
82 string16 result = gtk_util::GetStockPreferencesMenuLabel(); 82 string16 result = gtk_util::GetStockPreferencesMenuLabel();
83 if (!result.empty()) 83 if (!result.empty())
84 return result; 84 return result;
85 return l10n_util::GetStringUTF16(IDS_PREFERENCES); 85 return l10n_util::GetStringUTF16(IDS_PREFERENCES);
86 } 86 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/url_request_automation_job.cc ('k') | chrome/browser/background_mode_manager_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698