Index: chrome/browser/ui/search/other_device_menu.cc |
diff --git a/chrome/browser/ui/search/other_device_menu.cc b/chrome/browser/ui/search/other_device_menu.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..9eae0031ce968fc4d595460cdd5520e80fb7eb44 |
--- /dev/null |
+++ b/chrome/browser/ui/search/other_device_menu.cc |
@@ -0,0 +1,158 @@ |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#include "chrome/browser/ui/search/other_device_menu.h" |
+ |
+#include "base/string16.h" |
+#include "chrome/browser/ui/browser.h" |
+#include "chrome/browser/ui/browser_finder.h" |
+#include "chrome/browser/ui/browser_window.h" |
+#include "chrome/browser/ui/webui/ntp/foreign_session_handler.h" |
+#include "content/public/browser/web_contents.h" |
+#include "content/public/browser/web_ui.h" |
+#include "chrome/browser/sync/glue/session_model_associator.h" |
dhollowa
2012/10/08 19:15:09
nit: order
jeremycho
2012/10/09 01:52:13
Done.
|
+#include "grit/generated_resources.h" |
+#include "ui/base/l10n/l10n_util.h" |
+#include "ui/base/text/text_elider.h" |
+#include "ui/views/controls/menu/menu_model_adapter.h" |
+#include "ui/views/controls/menu/menu_runner.h" |
+#include "ui/views/widget/widget.h" |
+#include "webkit/glue/window_open_disposition.h" |
+ |
+using browser_sync::ForeignSessionHandler; |
dhollowa
2012/10/08 19:15:09
nit: please remove these using directives. The tr
jeremycho
2012/10/09 01:52:13
Done.
|
+using browser_sync::SessionModelAssociator; |
+ |
+// The max number of tabs that will be added to the menu. |
+// TODO(jeremycho): Discuss details with UX, e.g. is it prefereable to show only |
dhollowa
2012/10/08 19:15:09
Please log a bug for this TODO on this and cite it
jeremycho
2012/10/09 01:52:13
Look like we have resolution on this issue.
|
+// some of the tabs for a window or none at all? |
+static const size_t kMaxTabsToShow = 256; |
+ |
+// The max width of a menu. Menu text exceeding this will be elided. |
+static const int kMaxWidth = 375; |
+ |
+OtherDeviceMenu::OtherDeviceMenu(content::WebUI* web_ui, |
+ const std::string& session_id, |
+ const gfx::Point& location) : |
+ web_ui_(web_ui), session_id_(session_id), location_(location), |
+ ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)) { |
+ AddDeviceTabs(); |
+ |
+ // Add a "Open all" menu item if there is more than one tab. |
+ if (tab_data_.size() > 1) { |
+ linked_ptr<DictionaryValue> show_all_tab_value = |
+ linked_ptr<DictionaryValue>(new DictionaryValue()); |
+ // kInvalidId signifies that the entire session should be opened. |
+ show_all_tab_value->SetInteger( |
+ "sessionId", |
+ ForeignSessionHandler::kInvalidId); |
+ show_all_tab_value->SetInteger( |
+ "windowId", |
+ ForeignSessionHandler::kInvalidId); |
+ menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); |
+ menu_model_.AddItem( |
+ tab_data_.size(), |
+ l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_OPEN_ALL)); |
+ tab_data_.push_back(show_all_tab_value); |
+ } |
+} |
+ |
+OtherDeviceMenu::~OtherDeviceMenu() { |
+} |
+ |
+void OtherDeviceMenu::ShowMenu() { |
+ content::WebContents* web_contents = web_ui_->GetWebContents(); |
+ Browser* browser = browser::FindBrowserWithWebContents(web_contents); |
+ if (!browser) |
+ return; |
+ |
+ views::Widget* widget = views::Widget::GetWidgetForNativeWindow( |
+ browser->window()->GetNativeWindow()); |
+ if (!widget) |
+ return; |
+ |
+ views::MenuModelAdapter menu_model_adapter(&menu_model_); |
+ menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu())); |
+ |
+ if (menu_runner_->RunMenuAt(widget, NULL, gfx::Rect(location_, gfx::Size()), |
+ views::MenuItemView::TOPLEFT, 0) == |
+ views::MenuRunner::MENU_DELETED) |
+ return; |
+} |
+ |
+bool OtherDeviceMenu::IsCommandIdChecked(int command_id) const { |
+ return false; |
+} |
+ |
+bool OtherDeviceMenu::IsCommandIdEnabled(int command_id) const { |
+ return true; |
+} |
+ |
+void OtherDeviceMenu::ExecuteCommand(int command_id) { |
+ ExecuteCommand(command_id, 0); |
+} |
+ |
+// TODO(jeremycho): Figure out why mouse wheel clicks don't trigger this. |
+void OtherDeviceMenu::ExecuteCommand(int command_id, int event_flags) { |
+ DCHECK_GT(tab_data_.size(), static_cast<size_t>(command_id)) << |
+ "Invalid command_id from other device menu."; |
+ |
+ linked_ptr<DictionaryValue> tab_data = tab_data_[command_id]; |
+ // This is not a mistake - sessionId actually refers to the tab id. |
+ // See ForeignSessionHandler::SessionTabToValue. |
+ int tab_id = ForeignSessionHandler::kInvalidId; |
+ tab_data->GetInteger("sessionId", &tab_id); |
+ |
+ int window_id = ForeignSessionHandler::kInvalidId; |
+ tab_data->GetInteger("windowId", &window_id); |
+ |
+ WindowOpenDisposition disposition = |
+ chrome::DispositionFromEventFlags(event_flags); |
+ ForeignSessionHandler::OpenForeignSession( |
+ web_ui_, session_id_, window_id, tab_id, disposition); |
+ // TODO(jeremycho): Figure out what to log. |
dhollowa
2012/10/08 19:15:09
Will you resolve this in the current CL?
jeremycho
2012/10/09 01:52:13
Done.
|
+} |
+ |
+bool OtherDeviceMenu::GetAcceleratorForCommandId( |
+ int command_id, |
dhollowa
2012/10/08 19:15:09
nit: indent seems off here.
jeremycho
2012/10/09 01:52:13
Done.
|
+ ui::Accelerator* accelerator) { |
+ return false; |
+} |
+ |
+void OtherDeviceMenu::AddDeviceTabs() { |
+ SessionModelAssociator* associator = |
+ ForeignSessionHandler::GetModelAssociator(web_ui_); |
+ std::vector<const SessionWindow*> windows; |
+ |
+ // Populate the menu with the device's tabs, using separators between windows. |
+ if (associator && associator->GetForeignSession(session_id_, &windows)) { |
+ bool last_window_has_tabs = false; |
+ for (std::vector<const SessionWindow*>::const_iterator it = |
+ windows.begin(); it != windows.end(); ++it) { |
+ if (last_window_has_tabs) |
+ menu_model_.AddSeparator(ui::NORMAL_SEPARATOR); |
+ last_window_has_tabs = false; |
+ |
+ const SessionWindow* window = *it; |
+ for (size_t i = 0; i < window->tabs.size(); ++i) { |
+ linked_ptr<DictionaryValue> tab_value = |
+ linked_ptr<DictionaryValue>(new DictionaryValue()); |
+ if (ForeignSessionHandler::SessionTabToValue( |
+ *window->tabs[i], tab_value.get())) { |
+ last_window_has_tabs = true; |
+ tab_value->SetInteger("windowId", window->window_id.id()); |
+ string16 title; |
+ tab_value->GetString("title", &title); |
+ title = ui::ElideText( |
+ title, gfx::Font(), kMaxWidth, ui::ELIDE_AT_END); |
+ menu_model_.AddItem(tab_data_.size(), title); |
+ // TODO(jeremycho): Use tab_value.GetString("url", &url) to |
+ // request favicons. http://crbug.com/153410. |
+ tab_data_.push_back(tab_value); |
+ if (tab_data_.size() >= kMaxTabsToShow) |
+ return; |
+ } |
+ } |
+ } |
+ } |
+} |