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

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

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/accessibility_menu_button.h" 5 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/accessibility_util.h" 9 #include "chrome/browser/chromeos/accessibility_util.h"
10 #include "chrome/browser/chromeos/status/status_area_bubble.h" 10 #include "chrome/browser/chromeos/status/status_area_bubble.h"
11 #include "chrome/browser/chromeos/view_ids.h" 11 #include "chrome/browser/chromeos/view_ids.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/common/chrome_notification_types.h" 13 #include "chrome/common/chrome_notification_types.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "content/public/browser/notification_details.h" 15 #include "content/public/browser/notification_details.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/gfx/image/image.h" 20 #include "ui/gfx/image/image.h"
21 #include "ui/views/widget/widget.h"
22 #include "views/controls/image_view.h" 21 #include "views/controls/image_view.h"
23 #include "views/controls/menu/menu_item_view.h" 22 #include "views/controls/menu/menu_item_view.h"
24 #include "views/controls/menu/menu_runner.h" 23 #include "views/controls/menu/menu_runner.h"
24 #include "views/widget/widget.h"
25 25
26 namespace { 26 namespace {
27 27
28 enum MenuItemID { 28 enum MenuItemID {
29 MENU_ITEM_DISABLE_SPOKEN_FEEDBACK, 29 MENU_ITEM_DISABLE_SPOKEN_FEEDBACK,
30 }; 30 };
31 31
32 } // namespace 32 } // namespace
33 33
34 namespace chromeos { 34 namespace chromeos {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 views::MenuItemView* menu = new views::MenuItemView(this); 128 views::MenuItemView* menu = new views::MenuItemView(this);
129 if (accessibility_enabled_.GetValue()) 129 if (accessibility_enabled_.GetValue())
130 menu->AppendMenuItemWithLabel( 130 menu->AppendMenuItemWithLabel(
131 MENU_ITEM_DISABLE_SPOKEN_FEEDBACK, 131 MENU_ITEM_DISABLE_SPOKEN_FEEDBACK,
132 l10n_util::GetStringUTF16(IDS_STATUSBAR_DISABLE_SPOKEN_FEEDBACK)); 132 l10n_util::GetStringUTF16(IDS_STATUSBAR_DISABLE_SPOKEN_FEEDBACK));
133 // |menu_runner_| takes the ownership of |menu| 133 // |menu_runner_| takes the ownership of |menu|
134 menu_runner_.reset(new views::MenuRunner(menu)); 134 menu_runner_.reset(new views::MenuRunner(menu));
135 } 135 }
136 136
137 } // namespace chromeos 137 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/sim_dialog_delegate.cc ('k') | chrome/browser/chromeos/status/caps_lock_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698