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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 6588053: Initial landing of file_manager component extension (not yet enabled) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 9 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) 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // rsa -pubout -outform DER < /tmp/key.pem 2>/dev/null | base64 -w 0 398 // rsa -pubout -outform DER < /tmp/key.pem 2>/dev/null | base64 -w 0
399 typedef std::list<std::pair<FilePath::StringType, int> > 399 typedef std::list<std::pair<FilePath::StringType, int> >
400 ComponentExtensionList; 400 ComponentExtensionList;
401 ComponentExtensionList component_extensions; 401 ComponentExtensionList component_extensions;
402 402
403 // Bookmark manager. 403 // Bookmark manager.
404 component_extensions.push_back(std::make_pair( 404 component_extensions.push_back(std::make_pair(
405 FILE_PATH_LITERAL("bookmark_manager"), 405 FILE_PATH_LITERAL("bookmark_manager"),
406 IDR_BOOKMARKS_MANIFEST)); 406 IDR_BOOKMARKS_MANIFEST));
407 407
408 #if defined(FILE_MANAGER_EXTENSION)
zel 2011/02/28 18:41:23 why don't you put under OS_CHROMEOS? same goes for
409 component_extensions.push_back(std::make_pair(
410 FILE_PATH_LITERAL("file_manager"),
411 IDR_FILEMANAGER_MANIFEST));
412 #endif
413
408 #if defined(TOUCH_UI) 414 #if defined(TOUCH_UI)
409 component_extensions.push_back(std::make_pair( 415 component_extensions.push_back(std::make_pair(
410 FILE_PATH_LITERAL("keyboard"), 416 FILE_PATH_LITERAL("keyboard"),
411 IDR_KEYBOARD_MANIFEST)); 417 IDR_KEYBOARD_MANIFEST));
412 #endif 418 #endif
413 419
414 #if defined(OS_CHROMEOS) 420 #if defined(OS_CHROMEOS)
415 component_extensions.push_back(std::make_pair( 421 component_extensions.push_back(std::make_pair(
416 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"), 422 FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
417 IDR_MOBILE_MANIFEST)); 423 IDR_MOBILE_MANIFEST));
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 return pref_proxy_config_tracker_; 1510 return pref_proxy_config_tracker_;
1505 } 1511 }
1506 1512
1507 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1513 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1508 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1514 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1509 return NULL; 1515 return NULL;
1510 if (!prerender_manager_) 1516 if (!prerender_manager_)
1511 prerender_manager_ = new prerender::PrerenderManager(this); 1517 prerender_manager_ = new prerender::PrerenderManager(this);
1512 return prerender_manager_; 1518 return prerender_manager_;
1513 } 1519 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698