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

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

Issue 8479042: UI polish for certificate viewer (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk
Patch Set: Edit comments. Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/external_protocol_dialog.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) 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/chromeos/options/take_photo_dialog.h" 28 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
29 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 29 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
30 #include "chrome/browser/chromeos/system/timezone_settings.h" 30 #include "chrome/browser/chromeos/system/timezone_settings.h"
31 #include "chrome/browser/policy/browser_policy_connector.h" 31 #include "chrome/browser/policy/browser_policy_connector.h"
32 #include "chrome/browser/policy/cloud_policy_cache_base.h" 32 #include "chrome/browser/policy/cloud_policy_cache_base.h"
33 #include "chrome/browser/policy/cloud_policy_data_store.h" 33 #include "chrome/browser/policy/cloud_policy_data_store.h"
34 #include "chrome/browser/policy/cloud_policy_subsystem.h" 34 #include "chrome/browser/policy/cloud_policy_subsystem.h"
35 #include "chrome/browser/policy/enterprise_install_attributes.h" 35 #include "chrome/browser/policy/enterprise_install_attributes.h"
36 #include "chrome/browser/prefs/pref_service.h" 36 #include "chrome/browser/prefs/pref_service.h"
37 #include "chrome/browser/ui/browser_window.h" 37 #include "chrome/browser/ui/browser_window.h"
38 #include "chrome/browser/ui/dialog_style.h"
38 #include "chrome/browser/ui/views/window.h" 39 #include "chrome/browser/ui/views/window.h"
39 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
40 #include "net/base/network_change_notifier.h" 41 #include "net/base/network_change_notifier.h"
41 #include "policy/policy_constants.h" 42 #include "policy/policy_constants.h"
42 #include "views/widget/widget.h" 43 #include "views/widget/widget.h"
43 44
44 using chromeos::CrosLibrary; 45 using chromeos::CrosLibrary;
45 using chromeos::NetworkLibrary; 46 using chromeos::NetworkLibrary;
46 using chromeos::UpdateLibrary; 47 using chromeos::UpdateLibrary;
47 using chromeos::UserManager; 48 using chromeos::UserManager;
(...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 DictionaryValue* args, 1133 DictionaryValue* args,
1133 IPC::Message* reply_message) { 1134 IPC::Message* reply_message) {
1134 chromeos::TakePhotoDialog* take_photo_dialog = 1135 chromeos::TakePhotoDialog* take_photo_dialog =
1135 new chromeos::TakePhotoDialog(NULL); 1136 new chromeos::TakePhotoDialog(NULL);
1136 1137
1137 // Set up an observer (it will delete itself). 1138 // Set up an observer (it will delete itself).
1138 take_photo_dialog->AddObserver(new PhotoCaptureObserver( 1139 take_photo_dialog->AddObserver(new PhotoCaptureObserver(
1139 this, reply_message)); 1140 this, reply_message));
1140 1141
1141 views::Widget* window = browser::CreateViewsWindow( 1142 views::Widget* window = browser::CreateViewsWindow(
1142 browser->window()->GetNativeHandle(), take_photo_dialog); 1143 browser->window()->GetNativeHandle(), take_photo_dialog, STYLE_GENERIC);
1143 window->SetAlwaysOnTop(true); 1144 window->SetAlwaysOnTop(true);
1144 window->Show(); 1145 window->Show();
1145 } 1146 }
1146 1147
1147 void TestingAutomationProvider::PowerChanged( 1148 void TestingAutomationProvider::PowerChanged(
1148 const chromeos::PowerSupplyStatus& status) { 1149 const chromeos::PowerSupplyStatus& status) {
1149 power_status = status; 1150 power_status = status;
1150 } 1151 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/external_protocol_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698