chrome/browser/chromeos/status/network_menu.cc - Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4].

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/status/network_menu.cc

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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/status/input_method_menu_button_browsertest.cc ('k') | chrome/browser/chromeos/status/power_menu_button_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/status/network_menu.h"	5 #include "chrome/browser/chromeos/status/network_menu.h"

6	6

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

8	8

9 #include "app/l10n_util.h"	9 #include "app/l10n_util.h"

10 #include "app/resource_bundle.h"	10 #include "app/resource_bundle.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/stringprintf.h"	12 #include "base/stringprintf.h"

13 #include "base/utf_string_conversions.h"	13 #include "base/utf_string_conversions.h"

14 #include "chrome/browser/browser.h"

15 #include "chrome/browser/browser_list.h"

16 #include "chrome/browser/chromeos/cros/cros_library.h"	14 #include "chrome/browser/chromeos/cros/cros_library.h"

17 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h"	15 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h"

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

	17 #include "chrome/browser/ui/browser_list.h"

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

20 #include "chrome/browser/views/window.h"	20 #include "chrome/browser/views/window.h"

21 #include "gfx/canvas_skia.h"	21 #include "gfx/canvas_skia.h"

22 #include "gfx/skbitmap_operations.h"	22 #include "gfx/skbitmap_operations.h"

23 #include "grit/generated_resources.h"	23 #include "grit/generated_resources.h"

24 #include "grit/theme_resources.h"	24 #include "grit/theme_resources.h"

25 #include "net/base/escape.h"	25 #include "net/base/escape.h"

26 #include "views/controls/menu/menu_2.h"	26 #include "views/controls/menu/menu_2.h"

27 #include "views/window/window.h"	27 #include "views/window/window.h"

(...skipping 775 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
803 chromeos::TYPE_WIFI);	803 chromeos::TYPE_WIFI);

804 browser->ShowOptionsTab(page);	804 browser->ShowOptionsTab(page);

805 }	805 }

806 } else {	806 } else {

807 const bool kFocusLogin = true;	807 const bool kFocusLogin = true;

808 ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin);	808 ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin);

809 }	809 }

810 }	810 }

811	811

812 } // namespace chromeos	812 } // namespace chromeos

OLD	NEW