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

Side by Side Diff: chrome/browser/extensions/extension_service.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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 "chrome/browser/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #include "webkit/fileapi/file_system_context.h" 111 #include "webkit/fileapi/file_system_context.h"
112 #include "webkit/fileapi/file_system_mount_point_provider.h" 112 #include "webkit/fileapi/file_system_mount_point_provider.h"
113 #include "webkit/fileapi/file_system_path_manager.h" 113 #include "webkit/fileapi/file_system_path_manager.h"
114 #endif 114 #endif
115 115
116 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) 116 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
117 #include "chrome/browser/extensions/extension_input_ui_api.h" 117 #include "chrome/browser/extensions/extension_input_ui_api.h"
118 #endif 118 #endif
119 119
120 using base::Time; 120 using base::Time;
121 using content::BrowserThread;
121 122
122 namespace errors = extension_manifest_errors; 123 namespace errors = extension_manifest_errors;
123 124
124 namespace { 125 namespace {
125 126
126 #if defined(OS_LINUX) 127 #if defined(OS_LINUX)
127 static const int kOmniboxIconPaddingLeft = 2; 128 static const int kOmniboxIconPaddingLeft = 2;
128 static const int kOmniboxIconPaddingRight = 2; 129 static const int kOmniboxIconPaddingRight = 2;
129 #elif defined(OS_MACOSX) 130 #elif defined(OS_MACOSX)
130 static const int kOmniboxIconPaddingLeft = 0; 131 static const int kOmniboxIconPaddingLeft = 0;
(...skipping 2927 matching lines...) Expand 10 before | Expand all | Expand 10 after
3058 3059
3059 ExtensionService::NaClModuleInfoList::iterator 3060 ExtensionService::NaClModuleInfoList::iterator
3060 ExtensionService::FindNaClModule(const GURL& url) { 3061 ExtensionService::FindNaClModule(const GURL& url) {
3061 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin(); 3062 for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
3062 iter != nacl_module_list_.end(); ++iter) { 3063 iter != nacl_module_list_.end(); ++iter) {
3063 if (iter->url == url) 3064 if (iter->url == url)
3064 return iter; 3065 return iter;
3065 } 3066 }
3066 return nacl_module_list_.end(); 3067 return nacl_module_list_.end();
3067 } 3068 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_save_page_api.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698