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

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

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another typo Created 9 years, 4 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/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 } 442 }
443 443
444 // Remembered Wifi Networks. 444 // Remembered Wifi Networks.
445 const chromeos::WifiNetworkVector& remembered_wifi = 445 const chromeos::WifiNetworkVector& remembered_wifi =
446 network_library->remembered_wifi_networks(); 446 network_library->remembered_wifi_networks();
447 ListValue* items = new ListValue; 447 ListValue* items = new ListValue;
448 for (chromeos::WifiNetworkVector::const_iterator iter = 448 for (chromeos::WifiNetworkVector::const_iterator iter =
449 remembered_wifi.begin(); iter != remembered_wifi.end(); 449 remembered_wifi.begin(); iter != remembered_wifi.end();
450 ++iter) { 450 ++iter) {
451 const chromeos::WifiNetwork* wifi = *iter; 451 const chromeos::WifiNetwork* wifi = *iter;
452 items->Append(Value::CreateStringValue(wifi->service_path())); 452 items->Append(base::StringValue::New(wifi->service_path()));
453 } 453 }
454 return_value->Set("remembered_wifi", items); 454 return_value->Set("remembered_wifi", items);
455 455
456 AutomationJSONReply(this, reply_message).SendSuccess(return_value.get()); 456 AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
457 } 457 }
458 458
459 void TestingAutomationProvider::NetworkScan(DictionaryValue* args, 459 void TestingAutomationProvider::NetworkScan(DictionaryValue* args,
460 IPC::Message* reply_message) { 460 IPC::Message* reply_message) {
461 if (!EnsureCrosLibraryLoaded(this, reply_message)) 461 if (!EnsureCrosLibraryLoaded(this, reply_message))
462 return; 462 return;
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 1100
1101 // Set up an observer (it will delete itself). 1101 // Set up an observer (it will delete itself).
1102 take_photo_dialog->AddObserver(new PhotoCaptureObserver( 1102 take_photo_dialog->AddObserver(new PhotoCaptureObserver(
1103 this, reply_message)); 1103 this, reply_message));
1104 1104
1105 views::Widget* window = browser::CreateViewsWindow( 1105 views::Widget* window = browser::CreateViewsWindow(
1106 browser->window()->GetNativeHandle(), take_photo_dialog); 1106 browser->window()->GetNativeHandle(), take_photo_dialog);
1107 window->SetAlwaysOnTop(true); 1107 window->SetAlwaysOnTop(true);
1108 window->Show(); 1108 window->Show();
1109 } 1109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698