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

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

Issue 10872094: Disable media device attach intent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/ui/browser.h ('k') | no next file » | 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) 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/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 // OS_WIN 10 #endif // OS_WIN
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 profile_pref_registrar_.Add(prefs::kHomePage, this); 413 profile_pref_registrar_.Add(prefs::kHomePage, this);
414 414
415 BrowserList::AddBrowser(this); 415 BrowserList::AddBrowser(this);
416 416
417 // NOTE: These prefs all need to be explicitly destroyed in the destructor 417 // NOTE: These prefs all need to be explicitly destroyed in the destructor
418 // or you'll get a nasty surprise when you run the incognito tests. 418 // or you'll get a nasty surprise when you run the incognito tests.
419 encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector, 419 encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
420 profile_->GetPrefs(), NULL); 420 profile_->GetPrefs(), NULL);
421 421
422 instant_controller_.reset(new chrome::BrowserInstantController(this)); 422 instant_controller_.reset(new chrome::BrowserInstantController(this));
423
424 #if 0
425 // Disabled for M22. See http://crbug.com/144326.
423 device_attached_intent_source_.reset( 426 device_attached_intent_source_.reset(
424 new DeviceAttachedIntentSource(this, (this))); 427 new DeviceAttachedIntentSource(this, (this)));
428 #endif
425 429
426 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_INIT); 430 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_INIT);
427 431
428 FilePath profile_path = profile_->GetPath(); 432 FilePath profile_path = profile_->GetPath();
429 ProfileMetrics::LogProfileLaunch(profile_path); 433 ProfileMetrics::LogProfileLaunch(profile_path);
430 434
431 window_ = params.window ? params.window : CreateBrowserWindow(this); 435 window_ = params.window ? params.window : CreateBrowserWindow(this);
432 436
433 // TODO(beng): move to BrowserFrameWin. 437 // TODO(beng): move to BrowserFrameWin.
434 #if defined(OS_WIN) && !defined(USE_AURA) 438 #if defined(OS_WIN) && !defined(USE_AURA)
(...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after
2308 if (contents && !allow_js_access) { 2312 if (contents && !allow_js_access) {
2309 contents->web_contents()->GetController().LoadURL( 2313 contents->web_contents()->GetController().LoadURL(
2310 target_url, 2314 target_url,
2311 content::Referrer(), 2315 content::Referrer(),
2312 content::PAGE_TRANSITION_LINK, 2316 content::PAGE_TRANSITION_LINK,
2313 std::string()); // No extra headers. 2317 std::string()); // No extra headers.
2314 } 2318 }
2315 2319
2316 return contents != NULL; 2320 return contents != NULL;
2317 } 2321 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698