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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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) 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/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 "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/profiles/profile_manager.h" 25 #include "chrome/browser/profiles/profile_manager.h"
26 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
27 #include "chrome/browser/ui/browser_finder.h" 27 #include "chrome/browser/ui/browser_finder.h"
28 #include "chrome/browser/ui/chrome_pages.h" 28 #include "chrome/browser/ui/chrome_pages.h"
29 #include "chrome/browser/ui/singleton_tabs.h" 29 #include "chrome/browser/ui/singleton_tabs.h"
30 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
33 #include "grit/generated_resources.h" 33 #include "grit/generated_resources.h"
34 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 #include "grit/theme_resources_standard.h"
36 #include "net/base/escape.h" 35 #include "net/base/escape.h"
37 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
38 #include "ui/base/models/menu_model.h" 37 #include "ui/base/models/menu_model.h"
39 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/gfx/canvas.h" 39 #include "ui/gfx/canvas.h"
41 #include "ui/gfx/image/image_skia.h" 40 #include "ui/gfx/image/image_skia.h"
42 #include "ui/gfx/skbitmap_operations.h" 41 #include "ui/gfx/skbitmap_operations.h"
43 42
44 using content::BrowserThread; 43 using content::BrowserThread;
45 44
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 1097
1099 void NetworkMenu::ShowOtherWifi() { 1098 void NetworkMenu::ShowOtherWifi() {
1100 NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow()); 1099 NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow());
1101 } 1100 }
1102 1101
1103 void NetworkMenu::ShowOtherCellular() { 1102 void NetworkMenu::ShowOtherCellular() {
1104 ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow()); 1103 ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
1105 } 1104 }
1106 1105
1107 } // namespace chromeos 1106 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/chromeos/status/network_menu_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698