Skip to content

Commit

Permalink
Move and rename ClickToCallDialog to SharingDialog.
Browse files Browse the repository at this point in the history
This refactoring is needed for other features which reuse the same logic.

Bug: 988461
Change-Id: I658318864ba6fb86c918411954943cf2fd6fd20e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730459
Reviewed-by: Richard Knoll <knollr@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Yasmin Molazadeh <yasmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683589}
  • Loading branch information
Yasmin authored and Commit Bot committed Aug 2, 2019
1 parent 23d73b9 commit 78e32ec
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion chrome/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3355,11 +3355,11 @@ jumbo_split_static_library("browser") {
"sharing/click_to_call/click_to_call_constants.h",
"sharing/click_to_call/click_to_call_context_menu_observer.cc",
"sharing/click_to_call/click_to_call_context_menu_observer.h",
"sharing/click_to_call/click_to_call_dialog.h",
"sharing/click_to_call/click_to_call_sharing_dialog_controller.cc",
"sharing/click_to_call/click_to_call_sharing_dialog_controller.h",
"sharing/click_to_call/click_to_call_utils.cc",
"sharing/click_to_call/click_to_call_utils.h",
"sharing/sharing_dialog.h",
"sharing/sharing_dialog_controller.cc",
"sharing/sharing_dialog_controller.h",
"signin/signin_promo.cc",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/external_protocol/external_protocol_handler.h"
#include "chrome/browser/sharing/click_to_call/click_to_call_constants.h"
#include "chrome/browser/sharing/click_to_call/click_to_call_dialog.h"
#include "chrome/browser/sharing/sharing_device_info.h"
#include "chrome/browser/sharing/sharing_dialog.h"
#include "chrome/browser/sharing/sharing_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/shell_integration.h"
Expand Down Expand Up @@ -177,8 +177,7 @@ void ClickToCallSharingDialogController::OnAppChosen(const App& app) {
web_contents_);
}

void ClickToCallSharingDialogController::OnDialogClosed(
ClickToCallDialog* dialog) {
void ClickToCallSharingDialogController::OnDialogClosed(SharingDialog* dialog) {
// Ignore already replaced dialogs.
if (dialog != dialog_)
return;
Expand All @@ -192,7 +191,7 @@ void ClickToCallSharingDialogController::OnHelpTextClicked() {
GURL(chrome::kSyncLearnMoreURL));
}

ClickToCallDialog* ClickToCallSharingDialogController::GetDialog() const {
SharingDialog* ClickToCallSharingDialogController::GetDialog() const {
return dialog_;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace content {
class WebContents;
} // namespace content

class ClickToCallDialog;
class SharingDialog;
class SharingDeviceInfo;

class ClickToCallSharingDialogController
Expand All @@ -45,14 +45,14 @@ class ClickToCallSharingDialogController
void OnAppChosen(const App& app) override;

// Called by the ClickToCallDialogView when it is being closed.
void OnDialogClosed(ClickToCallDialog* dialog);
void OnDialogClosed(SharingDialog* dialog);

// Called by the ClickToCallDialogView when the help text got clicked.
void OnHelpTextClicked();

// Returns the currently open ClickToCallDialog or nullptr if there is no
// dialog open.
ClickToCallDialog* GetDialog() const;
SharingDialog* GetDialog() const;

bool is_loading() const { return is_loading_; }

Expand Down Expand Up @@ -82,7 +82,7 @@ class ClickToCallSharingDialogController
SharingService* sharing_service_ = nullptr;

GURL phone_url_;
ClickToCallDialog* dialog_ = nullptr;
SharingDialog* dialog_ = nullptr;
bool is_loading_ = false;
bool send_failed_ = false;
bool hide_default_handler_ = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_DIALOG_H_
#define CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_DIALOG_H_
#ifndef CHROME_BROWSER_SHARING_SHARING_DIALOG_H_
#define CHROME_BROWSER_SHARING_SHARING_DIALOG_H_

// The cross-platform UI interface which displays the click to call dialog.
// The cross-platform UI interface which displays the sharing dialog.
// This object is responsible for its own lifetime.
class ClickToCallDialog {
class SharingDialog {
public:
// Called to close the dialog and prevent future callbacks into the
// controller.
virtual void Hide() = 0;
};

#endif // CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_DIALOG_H_
#endif // CHROME_BROWSER_SHARING_SHARING_DIALOG_H_
4 changes: 2 additions & 2 deletions chrome/browser/ui/browser_window.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#endif

class Browser;
class ClickToCallDialog;
class SharingDialog;
class ClickToCallSharingDialogController;
class DownloadShelf;
class ExclusiveAccessContext;
Expand Down Expand Up @@ -332,7 +332,7 @@ class BrowserWindow : public ui::BaseWindow {
virtual bool IsToolbarShowing() const = 0;

// Shows the Click to Call dialog.
virtual ClickToCallDialog* ShowClickToCallDialog(
virtual SharingDialog* ShowClickToCallDialog(
content::WebContents* contents,
ClickToCallSharingDialogController* controller) = 0;

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/frame/browser_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble(
return bubble;
}

ClickToCallDialog* BrowserView::ShowClickToCallDialog(
SharingDialog* BrowserView::ShowClickToCallDialog(
content::WebContents* web_contents,
ClickToCallSharingDialogController* controller) {
auto* dialog_view = new ClickToCallDialogView(
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/frame/browser_view.h
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ class BrowserView : public BrowserWindow,
bool IsTabStripEditable() const override;
bool IsToolbarVisible() const override;
bool IsToolbarShowing() const override;
ClickToCallDialog* ShowClickToCallDialog(
SharingDialog* ShowClickToCallDialog(
content::WebContents* contents,
ClickToCallSharingDialogController* controller) override;
void ShowUpdateChromeDialog() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include <memory>
#include <vector>

#include "chrome/browser/sharing/click_to_call/click_to_call_dialog.h"
#include "chrome/browser/sharing/click_to_call/click_to_call_sharing_dialog_controller.h"
#include "chrome/browser/sharing/sharing_device_info.h"
#include "chrome/browser/sharing/sharing_dialog.h"
#include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/styled_label_listener.h"
Expand All @@ -23,7 +23,7 @@ class View;
class Browser;
class HoverButton;

class ClickToCallDialogView : public ClickToCallDialog,
class ClickToCallDialogView : public SharingDialog,
public views::ButtonListener,
public views::StyledLabelListener,
public LocationBarBubbleDelegateView {
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/base/test_browser_window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ autofill::SaveCardBubbleView* TestBrowserWindow::ShowSaveCreditCardBubble(
return nullptr;
}

ClickToCallDialog* TestBrowserWindow::ShowClickToCallDialog(
SharingDialog* TestBrowserWindow::ShowClickToCallDialog(
content::WebContents* web_contents,
ClickToCallSharingDialogController* controller) {
return nullptr;
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/base/test_browser_window.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class TestBrowserWindow : public BrowserWindow {
bool IsTabStripEditable() const override;
bool IsToolbarVisible() const override;
bool IsToolbarShowing() const override;
ClickToCallDialog* ShowClickToCallDialog(
SharingDialog* ShowClickToCallDialog(
content::WebContents* contents,
ClickToCallSharingDialogController* controller) override;
void ShowUpdateChromeDialog() override {}
Expand Down

0 comments on commit 78e32ec

Please sign in to comment.