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

Side by Side Diff: ash/shell/context_menu.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 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
« no previous file with comments | « ash/shell/context_menu.h ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/shell/context_menu.h" 5 #include "ash/shell/context_menu.h"
6 6
7 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/public/cpp/shelf_types.h" 7 #include "ash/public/cpp/shelf_types.h"
8 #include "ash/shelf/wm_shelf.h"
9 #include "ash/strings/grit/ash_strings.h" 9 #include "ash/strings/grit/ash_strings.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace shell { 12 namespace shell {
13 13
14 ContextMenu::ContextMenu(WmShelf* wm_shelf) 14 ContextMenu::ContextMenu(WmShelf* wm_shelf)
15 : ui::SimpleMenuModel(nullptr), 15 : ui::SimpleMenuModel(nullptr),
16 wm_shelf_(wm_shelf), 16 wm_shelf_(wm_shelf),
17 alignment_menu_(wm_shelf) { 17 alignment_menu_(wm_shelf) {
18 DCHECK(wm_shelf_); 18 DCHECK(wm_shelf_);
(...skipping 20 matching lines...) Expand all
39 if (command_id == MENU_AUTO_HIDE) { 39 if (command_id == MENU_AUTO_HIDE) {
40 wm_shelf_->SetAutoHideBehavior(wm_shelf_->auto_hide_behavior() == 40 wm_shelf_->SetAutoHideBehavior(wm_shelf_->auto_hide_behavior() ==
41 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS 41 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
42 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER 42 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
43 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); 43 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
44 } 44 }
45 } 45 }
46 46
47 } // namespace shell 47 } // namespace shell
48 } // namespace ash 48 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/context_menu.h ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698