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

Side by Side Diff: chrome_frame/chrome_frame_activex.cc

Issue 8909009: Remove remaining references to CEEE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync'ed source code, no new changes for this CL Created 9 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 (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_frame/chrome_frame_activex.h" 5 #include "chrome_frame/chrome_frame_activex.h"
6 6
7 #include <wininet.h> 7 #include <wininet.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 profile_name.assign(profile_name_arg, profile_name_arg.Length()); 463 profile_name.assign(profile_name_arg, profile_name_arg.Length());
464 } 464 }
465 465
466 std::string utf8_url; 466 std::string utf8_url;
467 if (url_.Length()) { 467 if (url_.Length()) {
468 WideToUTF8(url_, url_.Length(), &utf8_url); 468 WideToUTF8(url_, url_.Length(), &utf8_url);
469 } 469 }
470 470
471 InitializeAutomationSettings(); 471 InitializeAutomationSettings();
472 472
473 // To avoid http://code.google.com/p/chromium/issues/detail?id=63427,
474 // we always pass this flag needed by CEEE. It has no effect on
475 // normal CF operation.
476 //
477 // Extra arguments are passed on verbatim, so we add the -- prefix.
478 std::wstring chrome_extra_arguments(L"--");
479 chrome_extra_arguments.append(
480 ASCIIToWide(switches::kEnableExperimentalExtensionApis));
481
482 url_fetcher_->set_frame_busting(!is_privileged()); 473 url_fetcher_->set_frame_busting(!is_privileged());
483 automation_client_->SetUrlFetcher(url_fetcher_.get()); 474 automation_client_->SetUrlFetcher(url_fetcher_.get());
484 if (!InitializeAutomation(profile_name, chrome_extra_arguments, 475 if (!InitializeAutomation(profile_name, L"",
mad-corp 2011/12/15 19:45:37 Did you check if you could simply remove this argu
Roger Tawa OOO till Jul 10th 2011/12/16 16:24:30 Yes it can be removed. This cascaded down to a fe
485 IsIEInPrivate(), true, GURL(utf8_url), 476 IsIEInPrivate(), true, GURL(utf8_url),
486 GURL(), false)) { 477 GURL(), false)) {
487 DLOG(ERROR) << "Failed to navigate to url:" << utf8_url; 478 DLOG(ERROR) << "Failed to navigate to url:" << utf8_url;
488 return E_FAIL; 479 return E_FAIL;
489 } 480 }
490 481
491 // Log a metric that Chrome Frame is being used in Widget mode 482 // Log a metric that Chrome Frame is being used in Widget mode
492 UMA_LAUNCH_TYPE_COUNT(RENDERER_TYPE_CHROME_WIDGET); 483 UMA_LAUNCH_TYPE_COUNT(RENDERER_TYPE_CHROME_WIDGET);
493 } 484 }
494 485
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 if (FAILED(hr)) { 674 if (FAILED(hr)) {
684 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:" 675 NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
685 << base::StringPrintf(" 0x%08X", hr); 676 << base::StringPrintf(" 0x%08X", hr);
686 return hr; 677 return hr;
687 } 678 }
688 679
689 web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string), 680 web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
690 base::win::ScopedVariant(bho)); 681 base::win::ScopedVariant(bho));
691 return S_OK; 682 return S_OK;
692 } 683 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698