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

Side by Side Diff: chrome/browser/automation/automation_provider.cc

Issue 7834048: Preliminary work to allow Chrome to build 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) 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/browser/automation/automation_provider.h" 5 #include "chrome/browser/automation/automation_provider.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #include "content/browser/tab_contents/tab_contents_view.h" 89 #include "content/browser/tab_contents/tab_contents_view.h"
90 #include "content/common/json_value_serializer.h" 90 #include "content/common/json_value_serializer.h"
91 #include "content/common/view_messages.h" 91 #include "content/common/view_messages.h"
92 #include "net/proxy/proxy_config_service_fixed.h" 92 #include "net/proxy/proxy_config_service_fixed.h"
93 #include "net/proxy/proxy_service.h" 93 #include "net/proxy/proxy_service.h"
94 #include "net/url_request/url_request_context.h" 94 #include "net/url_request/url_request_context.h"
95 #include "net/url_request/url_request_context_getter.h" 95 #include "net/url_request/url_request_context_getter.h"
96 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" 96 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
97 #include "webkit/glue/password_form.h" 97 #include "webkit/glue/password_form.h"
98 98
99 #if defined(OS_WIN) 99 #if defined(OS_WIN) && !defined(USE_AURA)
100 #include "chrome/browser/external_tab_container_win.h" 100 #include "chrome/browser/external_tab_container_win.h"
101 #endif // defined(OS_WIN) 101 #endif // defined(OS_WIN)
102 102
103 #if defined(OS_CHROMEOS) 103 #if defined(OS_CHROMEOS)
104 #include "chrome/browser/chromeos/login/user_manager.h" 104 #include "chrome/browser/chromeos/login/user_manager.h"
105 #endif // defined(OS_CHROMEOS) 105 #endif // defined(OS_CHROMEOS)
106 106
107 using WebKit::WebFindOptions; 107 using WebKit::WebFindOptions;
108 using base::Time; 108 using base::Time;
109 109
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 AutomationMsg_ExecuteExtensionActionInActiveTabAsync, 361 AutomationMsg_ExecuteExtensionActionInActiveTabAsync,
362 ExecuteExtensionActionInActiveTabAsync) 362 ExecuteExtensionActionInActiveTabAsync)
363 IPC_MESSAGE_HANDLER(AutomationMsg_MoveExtensionBrowserAction, 363 IPC_MESSAGE_HANDLER(AutomationMsg_MoveExtensionBrowserAction,
364 MoveExtensionBrowserAction) 364 MoveExtensionBrowserAction)
365 IPC_MESSAGE_HANDLER(AutomationMsg_GetExtensionProperty, 365 IPC_MESSAGE_HANDLER(AutomationMsg_GetExtensionProperty,
366 GetExtensionProperty) 366 GetExtensionProperty)
367 IPC_MESSAGE_HANDLER(AutomationMsg_SaveAsAsync, SaveAsAsync) 367 IPC_MESSAGE_HANDLER(AutomationMsg_SaveAsAsync, SaveAsAsync)
368 IPC_MESSAGE_HANDLER(AutomationMsg_RemoveBrowsingData, RemoveBrowsingData) 368 IPC_MESSAGE_HANDLER(AutomationMsg_RemoveBrowsingData, RemoveBrowsingData)
369 IPC_MESSAGE_HANDLER(AutomationMsg_JavaScriptStressTestControl, 369 IPC_MESSAGE_HANDLER(AutomationMsg_JavaScriptStressTestControl,
370 JavaScriptStressTestControl) 370 JavaScriptStressTestControl)
371 #if defined(OS_WIN) 371 #if defined(OS_WIN) && !defined(USE_AURA)
372 // These are for use with external tabs. 372 // These are for use with external tabs.
373 IPC_MESSAGE_HANDLER(AutomationMsg_CreateExternalTab, CreateExternalTab) 373 IPC_MESSAGE_HANDLER(AutomationMsg_CreateExternalTab, CreateExternalTab)
374 IPC_MESSAGE_HANDLER(AutomationMsg_ProcessUnhandledAccelerator, 374 IPC_MESSAGE_HANDLER(AutomationMsg_ProcessUnhandledAccelerator,
375 ProcessUnhandledAccelerator) 375 ProcessUnhandledAccelerator)
376 IPC_MESSAGE_HANDLER(AutomationMsg_SetInitialFocus, SetInitialFocus) 376 IPC_MESSAGE_HANDLER(AutomationMsg_SetInitialFocus, SetInitialFocus)
377 IPC_MESSAGE_HANDLER(AutomationMsg_TabReposition, OnTabReposition) 377 IPC_MESSAGE_HANDLER(AutomationMsg_TabReposition, OnTabReposition)
378 IPC_MESSAGE_HANDLER(AutomationMsg_ForwardContextMenuCommandToChrome, 378 IPC_MESSAGE_HANDLER(AutomationMsg_ForwardContextMenuCommandToChrome,
379 OnForwardContextMenuCommandToChrome) 379 OnForwardContextMenuCommandToChrome)
380 IPC_MESSAGE_HANDLER(AutomationMsg_NavigateInExternalTab, 380 IPC_MESSAGE_HANDLER(AutomationMsg_NavigateInExternalTab,
381 NavigateInExternalTab) 381 NavigateInExternalTab)
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 } 965 }
966 } 966 }
967 } 967 }
968 968
969 void AutomationProvider::SaveAsAsync(int tab_handle) { 969 void AutomationProvider::SaveAsAsync(int tab_handle) {
970 NavigationController* tab = NULL; 970 NavigationController* tab = NULL;
971 TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab); 971 TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab);
972 if (tab_contents) 972 if (tab_contents)
973 tab_contents->OnSavePage(); 973 tab_contents->OnSavePage();
974 } 974 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_provider.h ('k') | chrome/browser/bookmarks/bookmark_drop_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698