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

Side by Side Diff: chrome/default_plugin/plugin_impl_win.cc

Issue 7841012: Get chrome to link with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
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/default_plugin/plugin_impl_win.h" 5 #include "chrome/default_plugin/plugin_impl_win.h"
6 6
7 #include <shellapi.h> 7 #include <shellapi.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 void PluginInstallerImpl::DownloadPlugin() { 340 void PluginInstallerImpl::DownloadPlugin() {
341 set_plugin_installer_state(PluginDownloadInitiated); 341 set_plugin_installer_state(PluginDownloadInitiated);
342 342
343 DVLOG(1) << "Initiating download for plugin URL " 343 DVLOG(1) << "Initiating download for plugin URL "
344 << plugin_download_url_.c_str(); 344 << plugin_download_url_.c_str();
345 345
346 DisplayStatus(IDS_DEFAULT_PLUGIN_DOWNLOADING_PLUGIN_MSG); 346 DisplayStatus(IDS_DEFAULT_PLUGIN_DOWNLOADING_PLUGIN_MSG);
347 347
348 if (!plugin_download_url_for_display_) { 348 if (!plugin_download_url_for_display_) {
349 #if !defined(USE_AURA)
349 ChildThread::current()->Send(new ChromePluginProcessHostMsg_DownloadUrl( 350 ChildThread::current()->Send(new ChromePluginProcessHostMsg_DownloadUrl(
350 plugin_download_url_, hwnd())); 351 plugin_download_url_, hwnd()));
352 #endif
351 } else { 353 } else {
352 default_plugin::g_browser->geturl(instance(), 354 default_plugin::g_browser->geturl(instance(),
353 plugin_download_url_.c_str(), 355 plugin_download_url_.c_str(),
354 "_blank"); 356 "_blank");
355 set_plugin_installer_state(PluginInstallerLaunchSuccess); 357 set_plugin_installer_state(PluginInstallerLaunchSuccess);
356 DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG); 358 DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
357 enable_click_ = true; 359 enable_click_ = true;
358 RefreshDisplay(); 360 RefreshDisplay();
359 } 361 }
360 } 362 }
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 bold_font_ = CreateFontIndirect(&font_info); 661 bold_font_ = CreateFontIndirect(&font_info);
660 DCHECK(bold_font_ != NULL); 662 DCHECK(bold_font_ != NULL);
661 663
662 font_info.lfUnderline = TRUE; 664 font_info.lfUnderline = TRUE;
663 underline_font_ = CreateFontIndirect(&font_info); 665 underline_font_ = CreateFontIndirect(&font_info);
664 DCHECK(underline_font_ != NULL); 666 DCHECK(underline_font_ != NULL);
665 return true; 667 return true;
666 } 668 }
667 669
668 void PluginInstallerImpl::NotifyPluginStatus(int status) { 670 void PluginInstallerImpl::NotifyPluginStatus(int status) {
671 #if !defined(USE_AURA)
669 ChildThread::current()->Send( 672 ChildThread::current()->Send(
670 new ChromePluginProcessHostMsg_MissingPluginStatus( 673 new ChromePluginProcessHostMsg_MissingPluginStatus(
671 status, 674 status,
672 renderer_process_id(), 675 renderer_process_id(),
673 render_view_id(), 676 render_view_id(),
674 hwnd())); 677 hwnd()));
678 #endif
675 } 679 }
OLDNEW
« no previous file with comments | « chrome/default_plugin/default_plugin.gyp ('k') | content/browser/renderer_host/render_message_filter_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698