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

Side by Side Diff: chrome_frame/chrome_frame_automation.h

Issue 5959006: Revert 70144 and 70145 and add a build fix. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 12 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/test/automation/tab_proxy.h ('k') | chrome_frame/chrome_frame_automation.cc » ('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 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ 5 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
6 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ 6 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlwin.h> 9 #include <atlwin.h>
10 #include <string> 10 #include <string>
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 route_all_top_level_navigations_ = route_all_top_level_navigations; 452 route_all_top_level_navigations_ = route_all_top_level_navigations;
453 } 453 }
454 454
455 protected: 455 protected:
456 // ChromeFrameAutomationProxy::LaunchDelegate implementation. 456 // ChromeFrameAutomationProxy::LaunchDelegate implementation.
457 virtual void LaunchComplete(ChromeFrameAutomationProxy* proxy, 457 virtual void LaunchComplete(ChromeFrameAutomationProxy* proxy,
458 AutomationLaunchResult result); 458 AutomationLaunchResult result);
459 virtual void AutomationServerDied(); 459 virtual void AutomationServerDied();
460 460
461 // TabProxyDelegate implementation 461 // TabProxyDelegate implementation
462 virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg); 462 virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
463 virtual void OnChannelError(TabProxy* tab); 463 virtual void OnChannelError(TabProxy* tab);
464 464
465 void CreateExternalTab(); 465 void CreateExternalTab();
466 AutomationLaunchResult CreateExternalTabComplete(HWND chrome_window, 466 AutomationLaunchResult CreateExternalTabComplete(HWND chrome_window,
467 HWND tab_window, 467 HWND tab_window,
468 int tab_handle, 468 int tab_handle,
469 int session_id); 469 int session_id);
470 // Called in UI thread. Here we fire event to the client notifying for 470 // Called in UI thread. Here we fire event to the client notifying for
471 // the result of Initialize() method call. 471 // the result of Initialize() method call.
472 void InitializeComplete(AutomationLaunchResult result); 472 void InitializeComplete(AutomationLaunchResult result);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 // set to true if the host needs to get notified of all top level navigations 559 // set to true if the host needs to get notified of all top level navigations
560 // in this page. This typically applies to hosts which would render the new 560 // in this page. This typically applies to hosts which would render the new
561 // page without chrome frame. Defaults to false. 561 // page without chrome frame. Defaults to false.
562 bool route_all_top_level_navigations_; 562 bool route_all_top_level_navigations_;
563 563
564 friend class BeginNavigateContext; 564 friend class BeginNavigateContext;
565 friend class CreateExternalTabContext; 565 friend class CreateExternalTabContext;
566 }; 566 };
567 567
568 #endif // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_ 568 #endif // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
OLDNEW
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | chrome_frame/chrome_frame_automation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698