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

Unified Diff: chrome/browser/ui/ash/user_action_handler.cc

Issue 183853037: aura: Remove client::UserActionClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unrevert Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/user_action_handler.cc
diff --git a/chrome/browser/ui/ash/user_action_handler.cc b/chrome/browser/ui/ash/user_action_handler.cc
deleted file mode 100644
index c7e61cf02d2a6a66d26b909691c83fdf158e66fa..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/user_action_handler.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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/ash/user_action_handler.h"
-
-#include "ash/wm/window_util.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/tabs/tab_strip_model.h"
-#include "content/public/browser/web_contents.h"
-
-// Returns the currently-active WebContents belonging to the active browser, or
-// NULL if there's no currently-active browser.
-content::WebContents* GetActiveWebContents() {
- Browser* browser = chrome::FindLastActiveWithHostDesktopType(
- chrome::HOST_DESKTOP_TYPE_ASH);
- if (!browser)
- return NULL;
- if (!ash::wm::IsActiveWindow(browser->window()->GetNativeWindow()))
- return NULL;
-
- return browser->tab_strip_model()->GetActiveWebContents();
-}
-
-UserActionHandler::UserActionHandler() {}
-
-UserActionHandler::~UserActionHandler() {}
-
-bool UserActionHandler::OnUserAction(
- aura::client::UserActionClient::Command command) {
- switch (command) {
- case aura::client::UserActionClient::BACK: {
- content::WebContents* contents = GetActiveWebContents();
- if (contents && contents->GetController().CanGoBack()) {
- contents->GetController().GoBack();
- return true;
- }
- break;
- }
- case aura::client::UserActionClient::FORWARD: {
- content::WebContents* contents = GetActiveWebContents();
- if (contents && contents->GetController().CanGoForward()) {
- contents->GetController().GoForward();
- return true;
- }
- break;
- }
- default:
- break;
- }
- return false;
-}
« no previous file with comments | « chrome/browser/ui/ash/user_action_handler.h ('k') | chrome/browser/ui/views/frame/browser_command_handler_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698