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

Side by Side Diff: chrome/browser/chromeos/login/ui/proxy_settings_dialog.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/proxy_settings_dialog.h" 5 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/chromeos/login/helper.h" 10 #include "chrome/browser/chromeos/login/helper.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "chrome/grit/generated_resources.h"
12 #include "chromeos/network/network_state.h" 13 #include "chromeos/network/network_state.h"
13 #include "chromeos/network/network_type_pattern.h" 14 #include "chromeos/network/network_type_pattern.h"
14 #include "content/public/browser/browser_context.h" 15 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
17 #include "grit/generated_resources.h"
18 #include "net/base/escape.h" 18 #include "net/base/escape.h"
19 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/gfx/rect.h" 21 #include "ui/gfx/rect.h"
22 #include "ui/gfx/size.h" 22 #include "ui/gfx/size.h"
23 23
24 namespace { 24 namespace {
25 25
26 // Hints for size of proxy settings dialog. 26 // Hints for size of proxy settings dialog.
27 const int kProxySettingsDialogReasonableWidth = 626; 27 const int kProxySettingsDialogReasonableWidth = 626;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 chrome::NOTIFICATION_LOGIN_PROXY_CHANGED, 95 chrome::NOTIFICATION_LOGIN_PROXY_CHANGED,
96 content::NotificationService::AllSources(), 96 content::NotificationService::AllSources(),
97 content::NotificationService::NoDetails()); 97 content::NotificationService::NoDetails());
98 } 98 }
99 99
100 bool ProxySettingsDialog::IsShown() { 100 bool ProxySettingsDialog::IsShown() {
101 return instance_count_ > 0; 101 return instance_count_ > 0;
102 } 102 }
103 103
104 } // namespace chromeos 104 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698