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

Side by Side Diff: ui/message_center/views/notifier_settings_view.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/message_center/views/notifier_settings_view.h" 5 #include "ui/message_center/views/notifier_settings_view.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 23 matching lines...) Expand all
34 #include "ui/views/controls/link_listener.h" 34 #include "ui/views/controls/link_listener.h"
35 #include "ui/views/controls/menu/menu_runner.h" 35 #include "ui/views/controls/menu/menu_runner.h"
36 #include "ui/views/controls/scroll_view.h" 36 #include "ui/views/controls/scroll_view.h"
37 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" 37 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
38 #include "ui/views/layout/box_layout.h" 38 #include "ui/views/layout/box_layout.h"
39 #include "ui/views/layout/fill_layout.h" 39 #include "ui/views/layout/fill_layout.h"
40 #include "ui/views/layout/grid_layout.h" 40 #include "ui/views/layout/grid_layout.h"
41 #include "ui/views/painter.h" 41 #include "ui/views/painter.h"
42 #include "ui/views/widget/widget.h" 42 #include "ui/views/widget/widget.h"
43 43
44 #if defined(USE_AURA)
45 #include "ui/aura/window.h"
46 #endif
47
48 namespace message_center { 44 namespace message_center {
49 namespace settings { 45 namespace settings {
50 46
51 // Additional views-specific parameters. 47 // Additional views-specific parameters.
52 48
53 // The width of the settings pane in pixels. 49 // The width of the settings pane in pixels.
54 const int kWidth = 360; 50 const int kWidth = 360;
55 51
56 // The width of the learn more icon in pixels. 52 // The width of the learn more icon in pixels.
57 const int kLearnMoreSize = 12; 53 const int kLearnMoreSize = 12;
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 menu_anchor, 715 menu_anchor,
720 views::MenuItemView::BUBBLE_ABOVE, 716 views::MenuItemView::BUBBLE_ABOVE,
721 ui::MENU_SOURCE_MOUSE, 717 ui::MENU_SOURCE_MOUSE,
722 views::MenuRunner::CONTEXT_MENU)) 718 views::MenuRunner::CONTEXT_MENU))
723 return; 719 return;
724 MessageCenterView* center_view = static_cast<MessageCenterView*>(parent()); 720 MessageCenterView* center_view = static_cast<MessageCenterView*>(parent());
725 center_view->OnSettingsChanged(); 721 center_view->OnSettingsChanged();
726 } 722 }
727 723
728 } // namespace message_center 724 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/notification_view.cc ('k') | ui/message_center/views/toast_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698