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

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

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_button.h" 5 #include "chrome/browser/chromeos/status/network_menu_button.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "app/gfx/canvas.h"
10 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
12 #include "base/string_util.h" 11 #include "base/string_util.h"
13 #include "chrome/browser/chromeos/options/network_config_view.h" 12 #include "chrome/browser/chromeos/options/network_config_view.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 13 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "chrome/browser/chromeos/status/status_area_host.h" 14 #include "chrome/browser/chromeos/status/status_area_host.h"
15 #include "gfx/canvas.h"
16 #include "gfx/skbitmap_operations.h" 16 #include "gfx/skbitmap_operations.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "views/widget/widget.h" 19 #include "views/widget/widget.h"
20 #include "views/window/window.h" 20 #include "views/window/window.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 //////////////////////////////////////////////////////////////////////////////// 24 ////////////////////////////////////////////////////////////////////////////////
25 // NetworkMenuButton 25 // NetworkMenuButton
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 if (host_->ShouldOpenButtonOptions(this)) { 512 if (host_->ShouldOpenButtonOptions(this)) {
513 label = 513 label =
514 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG); 514 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
515 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, 515 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
516 SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS)); 516 SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS));
517 } 517 }
518 } 518 }
519 } 519 }
520 520
521 } // namespace chromeos 521 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/clock_menu_button.cc ('k') | chrome/browser/chromeos/status/power_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698