| OLD | NEW |
| 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/automation/testing_automation_provider.h" | 5 #include "chrome/browser/automation/testing_automation_provider.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2947 break; | 2947 break; |
| 2948 case chrome::VIEW_TYPE_EXTENSION_POPUP: | 2948 case chrome::VIEW_TYPE_EXTENSION_POPUP: |
| 2949 type = "EXTENSION_POPUP"; | 2949 type = "EXTENSION_POPUP"; |
| 2950 break; | 2950 break; |
| 2951 case chrome::VIEW_TYPE_EXTENSION_INFOBAR: | 2951 case chrome::VIEW_TYPE_EXTENSION_INFOBAR: |
| 2952 type = "EXTENSION_INFOBAR"; | 2952 type = "EXTENSION_INFOBAR"; |
| 2953 break; | 2953 break; |
| 2954 case chrome::VIEW_TYPE_EXTENSION_DIALOG: | 2954 case chrome::VIEW_TYPE_EXTENSION_DIALOG: |
| 2955 type = "EXTENSION_DIALOG"; | 2955 type = "EXTENSION_DIALOG"; |
| 2956 break; | 2956 break; |
| 2957 case chrome::VIEW_TYPE_APP_SHELL: |
| 2958 type = "APP_SHELL"; |
| 2959 break; |
| 2957 default: | 2960 default: |
| 2958 type = "unknown"; | 2961 type = "unknown"; |
| 2959 break; | 2962 break; |
| 2960 } | 2963 } |
| 2961 item->SetString("view_type", type); | 2964 item->SetString("view_type", type); |
| 2962 item->SetString("url", ex_host->GetURL().spec()); | 2965 item->SetString("url", ex_host->GetURL().spec()); |
| 2963 item->SetBoolean("loaded", ex_host->did_stop_loading()); | 2966 item->SetBoolean("loaded", ex_host->did_stop_loading()); |
| 2964 extension_views->Append(item); | 2967 extension_views->Append(item); |
| 2965 } | 2968 } |
| 2966 } | 2969 } |
| (...skipping 3752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6719 | 6722 |
| 6720 Send(reply_message_); | 6723 Send(reply_message_); |
| 6721 redirect_query_ = 0; | 6724 redirect_query_ = 0; |
| 6722 reply_message_ = NULL; | 6725 reply_message_ = NULL; |
| 6723 } | 6726 } |
| 6724 | 6727 |
| 6725 void TestingAutomationProvider::OnRemoveProvider() { | 6728 void TestingAutomationProvider::OnRemoveProvider() { |
| 6726 if (g_browser_process) | 6729 if (g_browser_process) |
| 6727 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); | 6730 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); |
| 6728 } | 6731 } |
| OLD | NEW |