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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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"
11 #include "base/command_line.h" 10 #include "base/command_line.h"
12 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 13 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h" 14 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h"
16 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
20 #include "chrome/browser/ui/views/window.h" 19 #include "chrome/browser/ui/views/window.h"
21 #include "gfx/canvas_skia.h" 20 #include "gfx/canvas_skia.h"
22 #include "gfx/skbitmap_operations.h" 21 #include "gfx/skbitmap_operations.h"
23 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
24 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
25 #include "net/base/escape.h" 24 #include "net/base/escape.h"
25 #include "ui/base/resource/resource_bundle.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"
28 28
29 namespace { 29 namespace {
30 // Constants passed to Javascript: 30 // Constants passed to Javascript:
31 static const char* kNetworkTypeEthernet = "ethernet"; 31 static const char* kNetworkTypeEthernet = "ethernet";
32 static const char* kNetworkTypeWifi = "wifi"; 32 static const char* kNetworkTypeWifi = "wifi";
33 static const char* kNetworkTypeCellular = "cellular"; 33 static const char* kNetworkTypeCellular = "cellular";
34 static const char* kNetworkTypeOther = "other"; 34 static const char* kNetworkTypeOther = "other";
35 35
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 chrome::kInternetOptionsSubPage, 749 chrome::kInternetOptionsSubPage,
750 chromeos::TYPE_WIFI); 750 chromeos::TYPE_WIFI);
751 browser->ShowOptionsTab(page); 751 browser->ShowOptionsTab(page);
752 } 752 }
753 } else { 753 } else {
754 ShowNetworkConfigView(new NetworkConfigView()); 754 ShowNetworkConfigView(new NetworkConfigView());
755 } 755 }
756 } 756 }
757 757
758 } // namespace chromeos 758 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_dropdown_button.cc ('k') | chrome/browser/chromeos/status/network_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698