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

Side by Side Diff: chrome/browser/profile.cc

Issue 3047052: chromeos: 1st draft of ProxyConfigService for chromeos... (Closed) Base URL: svn://chrome-svn/chrome/trunk/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/profile.h ('k') | chrome/browser/profile_impl.h » ('j') | 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) 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/profile.h" 5 #include "chrome/browser/profile.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 if (directory.empty()) { 480 if (directory.empty()) {
481 return profile_->last_selected_directory(); 481 return profile_->last_selected_directory();
482 } 482 }
483 return directory; 483 return directory;
484 } 484 }
485 485
486 virtual void set_last_selected_directory(const FilePath& path) { 486 virtual void set_last_selected_directory(const FilePath& path) {
487 last_selected_directory_ = path; 487 last_selected_directory_ = path;
488 } 488 }
489 489
490 #if defined(OS_CHROMEOS)
491 virtual chromeos::ProxyConfigServiceImpl*
492 GetChromeOSProxyConfigServiceImpl() {
493 return profile_->GetChromeOSProxyConfigServiceImpl();
494 }
495 #endif // defined(OS_CHROMEOS)
496
490 virtual void ExitedOffTheRecordMode() { 497 virtual void ExitedOffTheRecordMode() {
491 // Drop our download manager so we forget about all the downloads made 498 // Drop our download manager so we forget about all the downloads made
492 // in off-the-record mode. 499 // in off-the-record mode.
493 download_manager_ = NULL; 500 download_manager_ = NULL;
494 } 501 }
495 502
496 virtual void Observe(NotificationType type, 503 virtual void Observe(NotificationType type,
497 const NotificationSource& source, 504 const NotificationSource& source,
498 const NotificationDetails& details) { 505 const NotificationDetails& details) {
499 DCHECK_EQ(NotificationType::BROWSER_CLOSED, type.value); 506 DCHECK_EQ(NotificationType::BROWSER_CLOSED, type.value);
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 565
559 // Tracks all BackgroundContents running under this profile. 566 // Tracks all BackgroundContents running under this profile.
560 scoped_ptr<BackgroundContentsService> background_contents_service_; 567 scoped_ptr<BackgroundContentsService> background_contents_service_;
561 568
562 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 569 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
563 }; 570 };
564 571
565 Profile *Profile::CreateOffTheRecordProfile() { 572 Profile *Profile::CreateOffTheRecordProfile() {
566 return new OffTheRecordProfileImpl(this); 573 return new OffTheRecordProfileImpl(this);
567 } 574 }
OLDNEW
« no previous file with comments | « chrome/browser/profile.h ('k') | chrome/browser/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698