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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 2183033003: chrome/app: Change auto to not deduce raw pointers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | 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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 // by the CommandLinePrefStore, and made available through the PrefService 785 // by the CommandLinePrefStore, and made available through the PrefService
786 // via the preference prefs::kApplicationLocale. The browser process uses 786 // via the preference prefs::kApplicationLocale. The browser process uses
787 // the --lang flag to pass the value of the PrefService in here. Maybe 787 // the --lang flag to pass the value of the PrefService in here. Maybe
788 // this value could be passed in a different way. 788 // this value could be passed in a different way.
789 const std::string locale = 789 const std::string locale =
790 command_line.GetSwitchValueASCII(switches::kLang); 790 command_line.GetSwitchValueASCII(switches::kLang);
791 #if defined(OS_ANDROID) 791 #if defined(OS_ANDROID)
792 // The renderer sandbox prevents us from accessing our .pak files directly. 792 // The renderer sandbox prevents us from accessing our .pak files directly.
793 // Therefore file descriptors to the .pak files that we need are passed in 793 // Therefore file descriptors to the .pak files that we need are passed in
794 // at process creation time. 794 // at process creation time.
795 auto global_descriptors = base::GlobalDescriptors::GetInstance(); 795 auto* global_descriptors = base::GlobalDescriptors::GetInstance();
796 int pak_fd = global_descriptors->Get(kAndroidLocalePakDescriptor); 796 int pak_fd = global_descriptors->Get(kAndroidLocalePakDescriptor);
797 base::MemoryMappedFile::Region pak_region = 797 base::MemoryMappedFile::Region pak_region =
798 global_descriptors->GetRegion(kAndroidLocalePakDescriptor); 798 global_descriptors->GetRegion(kAndroidLocalePakDescriptor);
799 ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd), 799 ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
800 pak_region); 800 pak_region);
801 801
802 int extra_pak_keys[] = { 802 int extra_pak_keys[] = {
803 kAndroidChrome100PercentPakDescriptor, 803 kAndroidChrome100PercentPakDescriptor,
804 kAndroidUIResourcesPakDescriptor, 804 kAndroidUIResourcesPakDescriptor,
805 }; 805 };
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 case version_info::Channel::CANARY: 1038 case version_info::Channel::CANARY:
1039 return true; 1039 return true;
1040 case version_info::Channel::DEV: 1040 case version_info::Channel::DEV:
1041 case version_info::Channel::BETA: 1041 case version_info::Channel::BETA:
1042 case version_info::Channel::STABLE: 1042 case version_info::Channel::STABLE:
1043 default: 1043 default:
1044 // Don't enable instrumentation. 1044 // Don't enable instrumentation.
1045 return false; 1045 return false;
1046 } 1046 }
1047 } 1047 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698