chrome/browser/chromeos/options/network_config_view.cc - Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/vpn_config_view.h » ('j') | no next file with comments »

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/options/network_config_view.h"	5 #include "chrome/browser/chromeos/options/network_config_view.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "base/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"	12 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"

13 #include "chrome/browser/chromeos/login/login_display_host_impl.h"	13 #include "chrome/browser/chromeos/login/login_display_host_impl.h"

14 #include "chrome/browser/chromeos/options/vpn_config_view.h"	14 #include "chrome/browser/chromeos/options/vpn_config_view.h"

15 #include "chrome/browser/chromeos/options/wifi_config_view.h"	15 #include "chrome/browser/chromeos/options/wifi_config_view.h"

16 #include "chrome/browser/chromeos/options/wimax_config_view.h"	16 #include "chrome/browser/chromeos/options/wimax_config_view.h"

17 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

18 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_finder.h"	19 #include "chrome/browser/ui/browser_finder.h"

20 #include "chrome/browser/ui/browser_window.h"	20 #include "chrome/browser/ui/browser_window.h"

(...skipping 289 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
310 image_view_ = new views::ImageView();	310 image_view_ = new views::ImageView();

311 // Disable \|image_view_\| so mouse events propagate to the parent.	311 // Disable \|image_view_\| so mouse events propagate to the parent.

312 image_view_->SetEnabled(false);	312 image_view_->SetEnabled(false);

313 image_view_->SetImage(gray_image_);	313 image_view_->SetImage(gray_image_);

314 image_view_->SetTooltipText(	314 image_view_->SetTooltipText(

315 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));	315 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));

316 AddChildView(image_view_);	316 AddChildView(image_view_);

317 }	317 }

318	318

319 } // namespace chromeos	319 } // namespace chromeos

OLD	NEW