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

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

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move ExtensionSet to extensions namespace Created 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 3517 matching lines...) Expand 10 before | Expand all | Expand 10 after
3528 return; 3528 return;
3529 } 3529 }
3530 ExtensionService* service = extensions::ExtensionSystem::Get( 3530 ExtensionService* service = extensions::ExtensionSystem::Get(
3531 browser->profile())->extension_service(); 3531 browser->profile())->extension_service();
3532 if (!service) { 3532 if (!service) {
3533 reply.SendError("No extensions service."); 3533 reply.SendError("No extensions service.");
3534 return; 3534 return;
3535 } 3535 }
3536 scoped_ptr<DictionaryValue> return_value(new DictionaryValue); 3536 scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
3537 ListValue* extensions_values = new ListValue; 3537 ListValue* extensions_values = new ListValue;
3538 const ExtensionSet* extensions = service->extensions(); 3538 const extensions::ExtensionSet* extensions = service->extensions();
3539 const ExtensionSet* disabled_extensions = service->disabled_extensions(); 3539 const extensions::ExtensionSet* disabled_extensions =
3540 service->disabled_extensions();
3540 ExtensionList all; 3541 ExtensionList all;
3541 all.insert(all.end(), 3542 all.insert(all.end(),
3542 extensions->begin(), 3543 extensions->begin(),
3543 extensions->end()); 3544 extensions->end());
3544 all.insert(all.end(), 3545 all.insert(all.end(),
3545 disabled_extensions->begin(), 3546 disabled_extensions->begin(),
3546 disabled_extensions->end()); 3547 disabled_extensions->end());
3547 ExtensionActionManager* extension_action_manager = 3548 ExtensionActionManager* extension_action_manager =
3548 ExtensionActionManager::Get(browser->profile()); 3549 ExtensionActionManager::Get(browser->profile());
3549 for (ExtensionList::const_iterator it = all.begin(); 3550 for (ExtensionList::const_iterator it = all.begin();
(...skipping 1906 matching lines...) Expand 10 before | Expand all | Expand 10 after
5456 if (g_browser_process) 5457 if (g_browser_process)
5457 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); 5458 g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
5458 } 5459 }
5459 5460
5460 void TestingAutomationProvider::EnsureTabSelected(Browser* browser, 5461 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
5461 WebContents* tab) { 5462 WebContents* tab) {
5462 TabStripModel* tab_strip = browser->tab_strip_model(); 5463 TabStripModel* tab_strip = browser->tab_strip_model();
5463 if (tab_strip->GetActiveWebContents() != tab) 5464 if (tab_strip->GetActiveWebContents() != tab)
5464 tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true); 5465 tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
5465 } 5466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698