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

Unified Diff: chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc

Issue 10885024: Integrate Chrome To Mobile with Action Box UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nil/NULL checks in ChromeToMobileBubbleController. Created 8 years, 4 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/views/location_bar/chrome_to_mobile_view.cc
diff --git a/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc b/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc
deleted file mode 100644
index bc486bf973b5dfad76e5a5e53fdc2ea5b3dceeb3..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/location_bar/chrome_to_mobile_view.cc
+++ /dev/null
@@ -1,83 +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/views/location_bar/chrome_to_mobile_view.h"
-
-#include "base/utf_string_conversions.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/command_updater.h"
-#include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/browser_dialogs.h"
-#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/event.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-
-ChromeToMobileView::ChromeToMobileView(
- LocationBarView* location_bar_view,
- CommandUpdater* command_updater)
- : location_bar_view_(location_bar_view),
- command_updater_(command_updater) {
- set_id(VIEW_ID_CHROME_TO_MOBILE_BUTTON);
- set_accessibility_focusable(true);
- SetImage(
- ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MOBILE));
- SetTooltipText(
- l10n_util::GetStringUTF16(IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP));
- SetVisible(command_updater_->IsCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE));
- command_updater_->AddCommandObserver(IDC_CHROME_TO_MOBILE_PAGE, this);
- TouchableLocationBarView::Init(this);
-}
-
-ChromeToMobileView::~ChromeToMobileView() {
- command_updater_->RemoveCommandObserver(IDC_CHROME_TO_MOBILE_PAGE, this);
-}
-
-void ChromeToMobileView::EnabledStateChangedForCommand(int id, bool enabled) {
- DCHECK_EQ(id, IDC_CHROME_TO_MOBILE_PAGE);
- if (enabled != visible()) {
- SetVisible(enabled);
- location_bar_view_->Update(NULL);
- }
-}
-
-int ChromeToMobileView::GetBuiltInHorizontalPadding() const {
- return GetBuiltInHorizontalPaddingImpl();
-}
-
-void ChromeToMobileView::GetAccessibleState(ui::AccessibleViewState* state) {
- state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_CHROME_TO_MOBILE);
- state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
-}
-
-bool ChromeToMobileView::GetTooltipText(const gfx::Point& p,
- string16* tooltip) const {
- // Don't show tooltip to distract user if ChromeToMobileBubbleView is showing.
- if (chrome::IsChromeToMobileBubbleViewShowing())
- return false;
-
- return views::ImageView::GetTooltipText(p, tooltip);
-}
-
-bool ChromeToMobileView::OnMousePressed(const ui::MouseEvent& event) {
- // Show the bubble on mouse release; that is standard button behavior.
- return true;
-}
-
-void ChromeToMobileView::OnMouseReleased(const ui::MouseEvent& event) {
- if (event.IsOnlyLeftMouseButton() && HitTestPoint(event.location()))
- command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE);
-}
-
-bool ChromeToMobileView::OnKeyPressed(const ui::KeyEvent& event) {
- if (event.key_code() == ui::VKEY_SPACE ||
- event.key_code() == ui::VKEY_RETURN) {
- command_updater_->ExecuteCommand(IDC_CHROME_TO_MOBILE_PAGE);
- return true;
- }
- return false;
-}
« no previous file with comments | « chrome/browser/ui/views/location_bar/chrome_to_mobile_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698