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

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

Issue 11316163: Remove the last usages of PrefObserver outside of Prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build. Created 8 years 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE)); 407 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE));
408 profile_pref_registrar_.Add( 408 profile_pref_registrar_.Add(
409 prefs::kHomePage, 409 prefs::kHomePage,
410 base::Bind(&Browser::MarkHomePageAsChanged, base::Unretained(this))); 410 base::Bind(&Browser::MarkHomePageAsChanged, base::Unretained(this)));
411 411
412 BrowserList::AddBrowser(this); 412 BrowserList::AddBrowser(this);
413 413
414 // NOTE: These prefs all need to be explicitly destroyed in the destructor 414 // NOTE: These prefs all need to be explicitly destroyed in the destructor
415 // or you'll get a nasty surprise when you run the incognito tests. 415 // or you'll get a nasty surprise when you run the incognito tests.
416 encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector, 416 encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
417 profile_->GetPrefs(), NULL); 417 profile_->GetPrefs());
418 418
419 if (is_type_tabbed()) 419 if (is_type_tabbed())
420 instant_controller_.reset(new chrome::BrowserInstantController(this)); 420 instant_controller_.reset(new chrome::BrowserInstantController(this));
421 421
422 #if 0 422 #if 0
423 // Disabled for M22. See http://crbug.com/144326. 423 // Disabled for M22. See http://crbug.com/144326.
424 device_attached_intent_source_.reset( 424 device_attached_intent_source_.reset(
425 new DeviceAttachedIntentSource(this, (this))); 425 new DeviceAttachedIntentSource(this, (this)));
426 #endif 426 #endif
427 427
(...skipping 1987 matching lines...) Expand 10 before | Expand all | Expand 10 after
2415 if (contents && !allow_js_access) { 2415 if (contents && !allow_js_access) {
2416 contents->web_contents()->GetController().LoadURL( 2416 contents->web_contents()->GetController().LoadURL(
2417 target_url, 2417 target_url,
2418 content::Referrer(), 2418 content::Referrer(),
2419 content::PAGE_TRANSITION_LINK, 2419 content::PAGE_TRANSITION_LINK,
2420 std::string()); // No extra headers. 2420 std::string()); // No extra headers.
2421 } 2421 }
2422 2422
2423 return contents != NULL; 2423 return contents != NULL;
2424 } 2424 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698