diff options
| author | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 15:33:11 +0000 |
|---|---|---|
| committer | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 15:33:11 +0000 |
| commit | e4ac5dff67e3f5ea9b3d7c4adad2aade7a21bbe7 (patch) | |
| tree | 0cf4c27a1038fcd71bd8d3bc957e5df4b7b7ffeb /chrome/browser | |
| parent | 3f3ae3384634db4fb0601f184b12b585b4a64971 (diff) | |
| download | chromium_src-e4ac5dff67e3f5ea9b3d7c4adad2aade7a21bbe7.zip chromium_src-e4ac5dff67e3f5ea9b3d7c4adad2aade7a21bbe7.tar.gz chromium_src-e4ac5dff67e3f5ea9b3d7c4adad2aade7a21bbe7.tar.bz2 | |
Use devtool_ prefix instead of dev_tools_ to be consistent with the rest code.
Review URL: http://codereview.chromium.org/42281
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.scons | 4 | ||||
| -rw-r--r-- | chrome/browser/browser.vcproj | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/devtools_ui.cc (renamed from chrome/browser/dom_ui/dev_tools_ui.cc) | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/devtools_ui.h (renamed from chrome/browser/dom_ui/dev_tools_ui.h) | 6 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_contents.cc | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 887acde..869ed45 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -396,8 +396,8 @@ input_files = ChromeFileList([ 'dom_ui/chrome_url_data_manager.h', 'dom_ui/debugger_ui.cc', 'dom_ui/debugger_ui.h', - 'dom_ui/dev_tools_ui.cc', - 'dom_ui/dev_tools_ui.h', + 'dom_ui/devtools_ui.cc', + 'dom_ui/devtools_ui.h', 'dom_ui/dom_ui.cc', 'dom_ui/dom_ui.h', 'dom_ui/dom_ui_contents.cc', diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 2880e43..b766ab6 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -1498,11 +1498,11 @@ > </File> <File - RelativePath=".\dom_ui\dev_tools_ui.cc" + RelativePath=".\dom_ui\devtools_ui.cc" > </File> <File - RelativePath=".\dom_ui\dev_tools_ui.h" + RelativePath=".\dom_ui\devtools_ui.h" > </File> <File diff --git a/chrome/browser/dom_ui/dev_tools_ui.cc b/chrome/browser/dom_ui/devtools_ui.cc index 4930775..61bfc06 100644 --- a/chrome/browser/dom_ui/dev_tools_ui.cc +++ b/chrome/browser/dom_ui/devtools_ui.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/dom_ui/dev_tools_ui.h" +#include "chrome/browser/dom_ui/devtools_ui.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/dom_ui/dev_tools_ui.h b/chrome/browser/dom_ui/devtools_ui.h index 2387fe5..4abfaba 100644 --- a/chrome/browser/dom_ui/dev_tools_ui.h +++ b/chrome/browser/dom_ui/devtools_ui.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DOM_UI_DEV_TOOLS_UI_H_ -#define CHROME_BROWSER_DOM_UI_DEV_TOOLS_UI_H_ +#ifndef CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_ +#define CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_ #include "chrome/browser/dom_ui/dom_ui.h" @@ -22,4 +22,4 @@ class DevToolsUI : public DOMUI { DISALLOW_COPY_AND_ASSIGN(DevToolsUI); }; -#endif // CHROME_BROWSER_DOM_UI_DEV_TOOLS_UI_H_ +#endif // CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_ diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc index 4d5f7e3..90e04dd 100644 --- a/chrome/browser/dom_ui/dom_ui_contents.cc +++ b/chrome/browser/dom_ui/dom_ui_contents.cc @@ -5,7 +5,7 @@ #include "chrome/browser/dom_ui/dom_ui_contents.h" #include "chrome/browser/dom_ui/debugger_ui.h" -#include "chrome/browser/dom_ui/dev_tools_ui.h" +#include "chrome/browser/dom_ui/devtools_ui.h" #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/dom_ui/downloads_ui.h" #include "chrome/browser/dom_ui/history_ui.h" @@ -258,8 +258,8 @@ bool DOMUIContents::InitCurrentUI(bool reload) { current_ui_->Init(); current_url_ = url; } - } - + } + if (current_ui_) return true; |