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

Side by Side Diff: chrome/common/extensions/manifest_url_handler.cc

Issue 24891002: Initial WebUI extension for enhanced bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 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
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/common/extensions/manifest_url_handler.h" 5 #include "chrome/common/extensions/manifest_url_handler.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 page != chrome::kChromeUIActivationMessageHost); 282 page != chrome::kChromeUIActivationMessageHost);
283 #endif 283 #endif
284 #if defined(FILE_MANAGER_EXTENSION) 284 #if defined(FILE_MANAGER_EXTENSION)
285 is_override = (is_override && 285 is_override = (is_override &&
286 !(extension->location() == Manifest::COMPONENT && 286 !(extension->location() == Manifest::COMPONENT &&
287 page == chrome::kChromeUIFileManagerHost)); 287 page == chrome::kChromeUIFileManagerHost));
288 #endif 288 #endif
289 #if defined(OS_CHROMEOS) 289 #if defined(OS_CHROMEOS)
290 is_override = (is_override && page != keyboard::kKeyboardWebUIHost); 290 is_override = (is_override && page != keyboard::kKeyboardWebUIHost);
291 #endif 291 #endif
292 #if defined(ENABLE_ENHANCED_BOOKMARKS)
293 is_override = (is_override &&
294 !(extension->location() == Manifest::COMPONENT &&
295 page == chrome::kChromeUIEnhancedBookmarksHost));
296 #endif
292 297
293 if (is_override || !iter.value().GetAsString(&val)) { 298 if (is_override || !iter.value().GetAsString(&val)) {
294 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides); 299 *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
295 return false; 300 return false;
296 } 301 }
297 // Replace the entry with a fully qualified chrome-extension:// URL. 302 // Replace the entry with a fully qualified chrome-extension:// URL.
298 url_overrides->chrome_url_overrides_[page] = extension->GetResourceURL(val); 303 url_overrides->chrome_url_overrides_[page] = extension->GetResourceURL(val);
299 304
300 // For component extensions, add override URL to extent patterns. 305 // For component extensions, add override URL to extent patterns.
301 if (extension->is_legacy_packaged_app() && 306 if (extension->is_legacy_packaged_app() &&
(...skipping 18 matching lines...) Expand all
320 extension->SetManifestData(keys::kChromeURLOverrides, 325 extension->SetManifestData(keys::kChromeURLOverrides,
321 url_overrides.release()); 326 url_overrides.release());
322 return true; 327 return true;
323 } 328 }
324 329
325 const std::vector<std::string> URLOverridesHandler::Keys() const { 330 const std::vector<std::string> URLOverridesHandler::Keys() const {
326 return SingleKey(keys::kChromeURLOverrides); 331 return SingleKey(keys::kChromeURLOverrides);
327 } 332 }
328 333
329 } // namespace extensions 334 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698