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

Side by Side Diff: chrome/browser/chromeos/login/ui/captive_portal_view.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/login/ui/captive_portal_view.h" 5 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" 8 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
9 #include "chrome/grit/generated_resources.h"
9 #include "chromeos/network/network_handler.h" 10 #include "chromeos/network/network_handler.h"
10 #include "chromeos/network/network_state.h" 11 #include "chromeos/network/network_state.h"
11 #include "chromeos/network/network_state_handler.h" 12 #include "chromeos/network/network_state_handler.h"
12 #include "components/captive_portal/captive_portal_detector.h" 13 #include "components/captive_portal/captive_portal_detector.h"
13 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
14 #include "grit/generated_resources.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/views/window/dialog_delegate.h" 16 #include "ui/views/window/dialog_delegate.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 namespace { 19 namespace {
20 20
21 const char* CaptivePortalStartURL() { 21 const char* CaptivePortalStartURL() {
22 return captive_portal::CaptivePortalDetector::kDefaultURL; 22 return captive_portal::CaptivePortalDetector::kDefaultURL;
23 } 23 }
24 24
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 bool to_different_document) { 93 bool to_different_document) {
94 SimpleWebViewDialog::LoadingStateChanged(source, to_different_document); 94 SimpleWebViewDialog::LoadingStateChanged(source, to_different_document);
95 // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned. 95 // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.
96 // Disable this heuristic as it has false positives. 96 // Disable this heuristic as it has false positives.
97 // Relying on just shill portal check to close dialog is fine. 97 // Relying on just shill portal check to close dialog is fine.
98 // if (!is_loading && !redirected_) 98 // if (!is_loading && !redirected_)
99 // proxy_->OnOriginalURLLoaded(); 99 // proxy_->OnOriginalURLLoaded();
100 } 100 }
101 101
102 } // namespace chromeos 102 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698