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

Side by Side Diff: chrome/browser/web_applications/web_app.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/browser/upgrade_detector_impl.cc ('k') | chrome/service/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/web_applications/web_app.h" 5 #include "chrome/browser/web_applications/web_app.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/i18n/file_util_icu.h" 14 #include "base/i18n/file_util_icu.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/prefs/pref_service.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
19 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
20 #include "build/build_config.h" 19 #include "build/build_config.h"
21 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/extensions/extension_ui_util.h" 21 #include "chrome/browser/extensions/extension_ui_util.h"
23 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/profiles/profile_manager.h" 23 #include "chrome/browser/profiles/profile_manager.h"
25 #include "chrome/common/chrome_constants.h" 24 #include "chrome/common/chrome_constants.h"
26 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 26 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
28 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "components/prefs/pref_service.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "extensions/browser/extension_registry.h" 30 #include "extensions/browser/extension_registry.h"
31 #include "extensions/browser/image_loader.h" 31 #include "extensions/browser/image_loader.h"
32 #include "extensions/common/constants.h" 32 #include "extensions/common/constants.h"
33 #include "extensions/common/extension.h" 33 #include "extensions/common/extension.h"
34 #include "extensions/common/extension_set.h" 34 #include "extensions/common/extension_set.h"
35 #include "extensions/common/manifest_handlers/icons_handler.h" 35 #include "extensions/common/manifest_handlers/icons_handler.h"
36 #include "extensions/grit/extensions_browser_resources.h" 36 #include "extensions/grit/extensions_browser_resources.h"
37 #include "skia/ext/image_operations.h" 37 #include "skia/ext/image_operations.h"
38 #include "third_party/skia/include/core/SkBitmap.h" 38 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 516
517 #if defined(OS_LINUX) 517 #if defined(OS_LINUX)
518 std::string GetWMClassFromAppName(std::string app_name) { 518 std::string GetWMClassFromAppName(std::string app_name) {
519 base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_'); 519 base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
520 base::TrimString(app_name, "_", &app_name); 520 base::TrimString(app_name, "_", &app_name);
521 return app_name; 521 return app_name;
522 } 522 }
523 #endif 523 #endif
524 524
525 } // namespace web_app 525 } // namespace web_app
OLDNEW
« no previous file with comments | « chrome/browser/upgrade_detector_impl.cc ('k') | chrome/service/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698