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

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

Issue 534013002: Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell_integration_linux.h" 5 #include "chrome/browser/shell_integration_linux.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 8
9 #if defined(USE_GLIB) 9 #if defined(USE_GLIB)
10 #include <glib.h> 10 #include <glib.h>
(...skipping 22 matching lines...) Expand all
33 #include "base/posix/eintr_wrapper.h" 33 #include "base/posix/eintr_wrapper.h"
34 #include "base/process/kill.h" 34 #include "base/process/kill.h"
35 #include "base/process/launch.h" 35 #include "base/process/launch.h"
36 #include "base/strings/string_number_conversions.h" 36 #include "base/strings/string_number_conversions.h"
37 #include "base/strings/string_tokenizer.h" 37 #include "base/strings/string_tokenizer.h"
38 #include "base/strings/string_util.h" 38 #include "base/strings/string_util.h"
39 #include "base/strings/utf_string_conversions.h" 39 #include "base/strings/utf_string_conversions.h"
40 #include "base/threading/thread.h" 40 #include "base/threading/thread.h"
41 #include "base/threading/thread_restrictions.h" 41 #include "base/threading/thread_restrictions.h"
42 #include "build/build_config.h" 42 #include "build/build_config.h"
43 #include "chrome/app/theme/grit/chrome_unscaled_resources.h"
43 #include "chrome/browser/shell_integration.h" 44 #include "chrome/browser/shell_integration.h"
44 #include "chrome/common/chrome_constants.h" 45 #include "chrome/common/chrome_constants.h"
45 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
46 #include "chrome/common/chrome_version_info.h" 47 #include "chrome/common/chrome_version_info.h"
47 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
48 #include "grit/chrome_unscaled_resources.h"
49 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
50 #include "ui/gfx/image/image_family.h" 50 #include "ui/gfx/image/image_family.h"
51 #include "url/gurl.h" 51 #include "url/gurl.h"
52 52
53 using content::BrowserThread; 53 using content::BrowserThread;
54 54
55 namespace { 55 namespace {
56 56
57 // The Categories for the App Launcher desktop shortcut. Should be the same as 57 // The Categories for the App Launcher desktop shortcut. Should be the same as
58 // the Chrome desktop shortcut, so they are in the same sub-menu. 58 // the Chrome desktop shortcut, so they are in the same sub-menu.
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 for (std::vector<base::FilePath>::const_iterator it = 1074 for (std::vector<base::FilePath>::const_iterator it =
1075 shortcut_filenames_app_menu.begin(); 1075 shortcut_filenames_app_menu.begin();
1076 it != shortcut_filenames_app_menu.end(); ++it) { 1076 it != shortcut_filenames_app_menu.end(); ++it) {
1077 DeleteShortcutInApplicationsMenu(*it, 1077 DeleteShortcutInApplicationsMenu(*it,
1078 base::FilePath(kDirectoryFilename)); 1078 base::FilePath(kDirectoryFilename));
1079 } 1079 }
1080 } 1080 }
1081 } 1081 }
1082 1082
1083 } // namespace shell_integration_linux 1083 } // namespace shell_integration_linux
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698