| 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/chromeos/offline/offline_load_page.h" | 5 #include "chrome/browser/chromeos/offline/offline_load_page.h" |
| 6 | 6 |
| 7 #include "apps/launcher.h" | 7 #include "apps/launcher.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_delegate.h" | 9 #include "ash/shell_delegate.h" |
| 10 #include "ash/system/tray/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "extensions/common/extension.h" | 33 #include "extensions/common/extension.h" |
| 34 #include "extensions/common/extension_icon_set.h" | 34 #include "extensions/common/extension_icon_set.h" |
| 35 #include "extensions/common/manifest_handlers/icons_handler.h" | 35 #include "extensions/common/manifest_handlers/icons_handler.h" |
| 36 #include "grit/browser_resources.h" | 36 #include "grit/browser_resources.h" |
| 37 #include "grit/chromium_strings.h" | 37 #include "grit/chromium_strings.h" |
| 38 #include "grit/generated_resources.h" | 38 #include "grit/generated_resources.h" |
| 39 #include "grit/google_chrome_strings.h" | 39 #include "grit/google_chrome_strings.h" |
| 40 #include "grit/theme_resources.h" | 40 #include "grit/theme_resources.h" |
| 41 #include "net/base/escape.h" | 41 #include "net/base/escape.h" |
| 42 #include "net/base/net_errors.h" | 42 #include "net/base/net_errors.h" |
| 43 #include "ui/base/l10n/l10n_util.h" | |
| 44 #include "ui/base/resource/resource_bundle.h" | 43 #include "ui/base/resource/resource_bundle.h" |
| 45 #include "ui/base/webui/jstemplate_builder.h" | 44 #include "ui/base/webui/jstemplate_builder.h" |
| 46 #include "ui/base/webui/web_ui_util.h" | 45 #include "ui/base/webui/web_ui_util.h" |
| 47 | 46 |
| 48 using content::BrowserThread; | 47 using content::BrowserThread; |
| 49 using content::InterstitialPage; | 48 using content::InterstitialPage; |
| 50 using content::WebContents; | 49 using content::WebContents; |
| 51 | 50 |
| 52 namespace chromeos { | 51 namespace chromeos { |
| 53 | 52 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 const bool online = type != net::NetworkChangeNotifier::CONNECTION_NONE; | 159 const bool online = type != net::NetworkChangeNotifier::CONNECTION_NONE; |
| 161 DVLOG(1) << "ConnectionTypeObserver notification received: state=" | 160 DVLOG(1) << "ConnectionTypeObserver notification received: state=" |
| 162 << (online ? "online" : "offline"); | 161 << (online ? "online" : "offline"); |
| 163 if (online) { | 162 if (online) { |
| 164 net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this); | 163 net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this); |
| 165 interstitial_page_->Proceed(); | 164 interstitial_page_->Proceed(); |
| 166 } | 165 } |
| 167 } | 166 } |
| 168 | 167 |
| 169 } // namespace chromeos | 168 } // namespace chromeos |
| OLD | NEW |