summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorwyck@chromium.org <wyck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 15:41:32 +0000
committerwyck@chromium.org <wyck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 15:41:32 +0000
commit60a55109c391fcab1ff41b60b5394a6ae3d09bbc (patch)
treef1091c7062d733d43458b70f745ac3d3c7e88694 /content
parent10ba61356902583fc39ccf932c8a9cc38df186f5 (diff)
downloadchromium_src-60a55109c391fcab1ff41b60b5394a6ae3d09bbc.zip
chromium_src-60a55109c391fcab1ff41b60b5394a6ae3d09bbc.tar.gz
chromium_src-60a55109c391fcab1ff41b60b5394a6ae3d09bbc.tar.bz2
Prepare to make WebUIMessageHandler conform to style guide.
WebUIMessageHandler had a protected data member WebUI* web_ui_. In this CL, there is now a protected accessor webui(), and the data member will be private, as per the C++ style guide. Unfortunately many files are affected by this change, but the correction just involves changing: web_ui_->xxx; to: web_ui()->xxx; Fixing all the affected derived classes at once may be hard because there is high traffic in WebUI development. There are something like 86 files affected, so I am only ADDING the protected accessor as a first pass, and then in a subsequent CL I will fix affected handlers, and then finally there will be a CL that makes the protected data member private. This should reduce merge/build/review headaches. BUG=None TEST=None Review URL: http://codereview.chromium.org/7497064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/webui/web_ui.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h
index 76482ba..3460af9 100644
--- a/content/browser/webui/web_ui.h
+++ b/content/browser/webui/web_ui.h
@@ -225,7 +225,10 @@ class WebUIMessageHandler {
// Extract a string value from a list Value.
string16 ExtractStringValue(const base::ListValue* value);
- WebUI* web_ui_;
+ // Returns the attached WebUI for this handler.
+ WebUI* web_ui() const { return web_ui_; }
+
+ WebUI* web_ui_; // TODO(wyck): Make private after merge conflicts go away.
private:
DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler);