summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 18:25:38 +0000
committerfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 18:25:38 +0000
commit0aad647f503e9ff1190f1d3a4fb6b807d067b0f3 (patch)
treebd6919e40b03684cc8bf40e2cc99891dd8c1f7fd
parentdcf1028746839e150c7446d43ef69dc5a6558471 (diff)
downloadchromium_src-0aad647f503e9ff1190f1d3a4fb6b807d067b0f3.zip
chromium_src-0aad647f503e9ff1190f1d3a4fb6b807d067b0f3.tar.gz
chromium_src-0aad647f503e9ff1190f1d3a4fb6b807d067b0f3.tar.bz2
GuestView cleanup
Event::event_name() seems unnecessarily redundant. Reduced to Event::name(). BUG=none TBR=fsamuel@chromium.org Review URL: https://codereview.chromium.org/99283005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238724 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/guestview/guestview.cc6
-rw-r--r--chrome/browser/guestview/guestview.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/guestview/guestview.cc b/chrome/browser/guestview/guestview.cc
index 82ea957..eca6aea 100644
--- a/chrome/browser/guestview/guestview.cc
+++ b/chrome/browser/guestview/guestview.cc
@@ -31,9 +31,9 @@ static base::LazyInstance<WebContentsGuestViewMap> webcontents_guestview_map =
} // namespace
-GuestView::Event::Event(const std::string& event_name,
+GuestView::Event::Event(const std::string& name,
scoped_ptr<DictionaryValue> args)
- : event_name_(event_name),
+ : name_(name),
args_(args.Pass()) {
}
@@ -200,7 +200,7 @@ void GuestView::DispatchEvent(Event* event) {
extensions::EventRouter::DispatchEvent(
embedder_web_contents_, profile, extension_id_,
- event->event_name(), args.Pass(),
+ event->name(), args.Pass(),
extensions::EventRouter::USER_GESTURE_UNKNOWN, info);
delete event;
diff --git a/chrome/browser/guestview/guestview.h b/chrome/browser/guestview/guestview.h
index 825383b..8b6e03b 100644
--- a/chrome/browser/guestview/guestview.h
+++ b/chrome/browser/guestview/guestview.h
@@ -29,15 +29,15 @@ class GuestView : public content::BrowserPluginGuestDelegate {
class Event {
public:
- Event(const std::string& event_name, scoped_ptr<DictionaryValue> args);
+ Event(const std::string& name, scoped_ptr<DictionaryValue> args);
~Event();
- const std::string& event_name() const { return event_name_; }
+ const std::string& name() const { return name_; }
scoped_ptr<DictionaryValue> GetArguments();
private:
- const std::string event_name_;
+ const std::string name_;
scoped_ptr<DictionaryValue> args_;
};