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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 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
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 "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
28 #include "net/base/escape.h" 28 #include "net/base/escape.h"
29 #include "third_party/skia/include/core/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/models/menu_model.h" 31 #include "ui/base/models/menu_model.h"
32 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
33 #include "ui/gfx/canvas_skia.h" 33 #include "ui/gfx/canvas_skia.h"
34 #include "ui/gfx/skbitmap_operations.h" 34 #include "ui/gfx/skbitmap_operations.h"
35 #include "ui/views/widget/widget.h"
35 #include "views/controls/menu/menu_item_view.h" 36 #include "views/controls/menu/menu_item_view.h"
36 #include "views/controls/menu/menu_model_adapter.h" 37 #include "views/controls/menu/menu_model_adapter.h"
37 #include "views/controls/menu/menu_runner.h" 38 #include "views/controls/menu/menu_runner.h"
38 #include "views/controls/menu/submenu_view.h" 39 #include "views/controls/menu/submenu_view.h"
39 #include "views/widget/widget.h"
40 40
41 using content::BrowserThread; 41 using content::BrowserThread;
42 42
43 namespace { 43 namespace {
44 44
45 // Offsets for views menu ids (main menu and submenu ids use the same 45 // Offsets for views menu ids (main menu and submenu ids use the same
46 // namespace). 46 // namespace).
47 const int kMainIndexMask = 0x1000; 47 const int kMainIndexMask = 0x1000;
48 const int kVPNIndexMask = 0x2000; 48 const int kVPNIndexMask = 0x2000;
49 const int kMoreIndexMask = 0x4000; 49 const int kMoreIndexMask = 0x4000;
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 std::string page = StringPrintf( 1053 std::string page = StringPrintf(
1054 "%s?servicePath=%s&networkType=%d&networkName=%s", 1054 "%s?servicePath=%s&networkType=%d&networkName=%s",
1055 chrome::kInternetOptionsSubPage, 1055 chrome::kInternetOptionsSubPage,
1056 net::EscapeUrlEncodedData(network->service_path(), true).c_str(), 1056 net::EscapeUrlEncodedData(network->service_path(), true).c_str(),
1057 network->type(), 1057 network->type(),
1058 net::EscapeUrlEncodedData(network_name, false).c_str()); 1058 net::EscapeUrlEncodedData(network_name, false).c_str());
1059 browser->ShowOptionsTab(page); 1059 browser->ShowOptionsTab(page);
1060 } 1060 }
1061 1061
1062 } // namespace chromeos 1062 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/memory_menu_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