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

Side by Side Diff: chrome/browser/net/chrome_url_request_context.cc

Issue 3173018: Merge 55103 - Refactored extension privilege enumeration and implemented URLP... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/chrome_url_request_context.h ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
None
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/net/chrome_url_request_context.h" 5 #include "chrome/browser/net/chrome_url_request_context.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 return FilePath(); 788 return FilePath();
789 } 789 }
790 790
791 std::string ChromeURLRequestContext::GetDefaultLocaleForExtension( 791 std::string ChromeURLRequestContext::GetDefaultLocaleForExtension(
792 const std::string& id) { 792 const std::string& id) {
793 ExtensionInfoMap::iterator iter = extension_info_.find(id); 793 ExtensionInfoMap::iterator iter = extension_info_.find(id);
794 std::string result; 794 std::string result;
795 if (iter != extension_info_.end()) 795 if (iter != extension_info_.end())
796 result = iter->second->default_locale; 796 result = iter->second->default_locale;
797 797

error: old chunk mismatch

OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_url_request_context.h ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698