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

Side by Side Diff: chrome/browser/chromeos/frame/browser_view.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screen_locker.h » ('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) 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/frame/browser_view.h" 5 #include "chrome/browser/chromeos/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 // This MenuItemView delegate class forwards to the 65 // This MenuItemView delegate class forwards to the
66 // SimpleMenuModel::Delegate() implementation. 66 // SimpleMenuModel::Delegate() implementation.
67 class SimpleMenuModelDelegateAdapter : public views::MenuDelegate { 67 class SimpleMenuModelDelegateAdapter : public views::MenuDelegate {
68 public: 68 public:
69 explicit SimpleMenuModelDelegateAdapter( 69 explicit SimpleMenuModelDelegateAdapter(
70 ui::SimpleMenuModel::Delegate* simple_menu_model_delegate); 70 ui::SimpleMenuModel::Delegate* simple_menu_model_delegate);
71 71
72 // views::MenuDelegate implementation. 72 // views::MenuDelegate implementation.
73 virtual bool GetAccelerator(int id, 73 virtual bool GetAccelerator(int id,
74 views::Accelerator* accelerator) OVERRIDE; 74 ui::Accelerator* accelerator) OVERRIDE;
75 virtual string16 GetLabel(int id) const OVERRIDE; 75 virtual string16 GetLabel(int id) const OVERRIDE;
76 virtual bool IsCommandEnabled(int id) const OVERRIDE; 76 virtual bool IsCommandEnabled(int id) const OVERRIDE;
77 virtual bool IsItemChecked(int id) const OVERRIDE; 77 virtual bool IsItemChecked(int id) const OVERRIDE;
78 virtual void ExecuteCommand(int id) OVERRIDE; 78 virtual void ExecuteCommand(int id) OVERRIDE;
79 79
80 private: 80 private:
81 ui::SimpleMenuModel::Delegate* simple_menu_model_delegate_; 81 ui::SimpleMenuModel::Delegate* simple_menu_model_delegate_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(SimpleMenuModelDelegateAdapter); 83 DISALLOW_COPY_AND_ASSIGN(SimpleMenuModelDelegateAdapter);
84 }; 84 };
85 85
86 // SimpleMenuModelDelegateAdapter: 86 // SimpleMenuModelDelegateAdapter:
87 SimpleMenuModelDelegateAdapter::SimpleMenuModelDelegateAdapter( 87 SimpleMenuModelDelegateAdapter::SimpleMenuModelDelegateAdapter(
88 ui::SimpleMenuModel::Delegate* simple_menu_model_delegate) 88 ui::SimpleMenuModel::Delegate* simple_menu_model_delegate)
89 : simple_menu_model_delegate_(simple_menu_model_delegate) { 89 : simple_menu_model_delegate_(simple_menu_model_delegate) {
90 } 90 }
91 91
92 // SimpleMenuModelDelegateAdapter, views::MenuDelegate implementation. 92 // SimpleMenuModelDelegateAdapter, views::MenuDelegate implementation.
93 93
94 bool SimpleMenuModelDelegateAdapter::GetAccelerator( 94 bool SimpleMenuModelDelegateAdapter::GetAccelerator(
95 int id, 95 int id,
96 views::Accelerator* accelerator) { 96 ui::Accelerator* accelerator) {
97 return simple_menu_model_delegate_->GetAcceleratorForCommandId( 97 return simple_menu_model_delegate_->GetAcceleratorForCommandId(
98 id, accelerator); 98 id, accelerator);
99 } 99 }
100 100
101 string16 SimpleMenuModelDelegateAdapter::GetLabel(int id) const { 101 string16 SimpleMenuModelDelegateAdapter::GetLabel(int id) const {
102 return simple_menu_model_delegate_->GetLabelForCommandId(id); 102 return simple_menu_model_delegate_->GetLabelForCommandId(id);
103 } 103 }
104 104
105 bool SimpleMenuModelDelegateAdapter::IsCommandEnabled(int id) const { 105 bool SimpleMenuModelDelegateAdapter::IsCommandEnabled(int id) const {
106 return simple_menu_model_delegate_->IsCommandIdEnabled(id); 106 return simple_menu_model_delegate_->IsCommandIdEnabled(id);
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 640 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
641 // Create a browser view for chromeos. 641 // Create a browser view for chromeos.
642 BrowserView* view; 642 BrowserView* view;
643 if (browser->is_type_popup() || browser->is_type_panel()) 643 if (browser->is_type_popup() || browser->is_type_panel())
644 view = new chromeos::PanelBrowserView(browser); 644 view = new chromeos::PanelBrowserView(browser);
645 else 645 else
646 view = new chromeos::BrowserView(browser); 646 view = new chromeos::BrowserView(browser);
647 (new BrowserFrame(view))->InitBrowserFrame(); 647 (new BrowserFrame(view))->InitBrowserFrame();
648 return view; 648 return view;
649 } 649 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screen_locker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698