| OLD | NEW |
| 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/notifications/balloon_host.h" | 5 #include "chrome/browser/notifications/balloon_host.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_list.h" | 7 #include "chrome/browser/browser_list.h" |
| 8 #include "chrome/browser/extensions/extension_process_manager.h" | 8 #include "chrome/browser/extensions/extension_process_manager.h" |
| 9 #include "chrome/browser/notifications/balloon.h" | 9 #include "chrome/browser/notifications/balloon.h" |
| 10 #include "chrome/browser/notifications/notification.h" | 10 #include "chrome/browser/notifications/notification.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 rvh->CreateRenderView(string16()); | 214 rvh->CreateRenderView(string16()); |
| 215 #if defined(OS_MACOSX) | 215 #if defined(OS_MACOSX) |
| 216 registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DID_PAINT, | 216 registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DID_PAINT, |
| 217 Source<RenderWidgetHost>(render_view_host_)); | 217 Source<RenderWidgetHost>(render_view_host_)); |
| 218 #endif | 218 #endif |
| 219 rvh->NavigateToURL(balloon_->notification().content_url()); | 219 rvh->NavigateToURL(balloon_->notification().content_url()); |
| 220 | 220 |
| 221 initialized_ = true; | 221 initialized_ = true; |
| 222 } | 222 } |
| 223 | 223 |
| 224 void BalloonHost::EnableDOMUI() { | 224 void BalloonHost::EnableWebUI() { |
| 225 DCHECK(render_view_host_ == NULL) << | 225 DCHECK(render_view_host_ == NULL) << |
| 226 "EnableDOMUI has to be called before a renderer is created."; | 226 "EnableWebUI has to be called before a renderer is created."; |
| 227 enable_dom_ui_ = true; | 227 enable_dom_ui_ = true; |
| 228 } | 228 } |
| 229 | 229 |
| 230 void BalloonHost::UpdateInspectorSetting(const std::string& key, | 230 void BalloonHost::UpdateInspectorSetting(const std::string& key, |
| 231 const std::string& value) { | 231 const std::string& value) { |
| 232 RenderViewHostDelegateHelper::UpdateInspectorSetting( | 232 RenderViewHostDelegateHelper::UpdateInspectorSetting( |
| 233 GetProfile(), key, value); | 233 GetProfile(), key, value); |
| 234 } | 234 } |
| 235 | 235 |
| 236 void BalloonHost::ClearInspectorSettings() { | 236 void BalloonHost::ClearInspectorSettings() { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 253 | 253 |
| 254 void BalloonHost::NotifyDisconnect() { | 254 void BalloonHost::NotifyDisconnect() { |
| 255 if (!should_notify_on_disconnect_) | 255 if (!should_notify_on_disconnect_) |
| 256 return; | 256 return; |
| 257 | 257 |
| 258 should_notify_on_disconnect_ = false; | 258 should_notify_on_disconnect_ = false; |
| 259 NotificationService::current()->Notify( | 259 NotificationService::current()->Notify( |
| 260 NotificationType::NOTIFY_BALLOON_DISCONNECTED, | 260 NotificationType::NOTIFY_BALLOON_DISCONNECTED, |
| 261 Source<BalloonHost>(this), NotificationService::NoDetails()); | 261 Source<BalloonHost>(this), NotificationService::NoDetails()); |
| 262 } | 262 } |
| OLD | NEW |