r145421 - in trunk/src/chrome/browser: . bookmarks chromeos/extensions extensions hang_monitor importer printing ui ui/cocoa ui/cocoa/tab_contents ui/gtk ui/gtk/tab_contents ui/tab_contents ui/views ui/views/tab_contents ui/webui/chromeos

[tfa...@chromium.org]

Author: tfa...@chromium.org
Date: Tue Jul 3 18:41:27 2012
New Revision: 145421

Log:
browser: Put simple_message_box.h and chrome_web_contents_view_delegate.h into chrome namespace.

BUG=133088
TBR=b...@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10689095

Modified:
trunk/src/chrome/browser/bookmarks/bookmark_utils.cc
trunk/src/chrome/browser/chrome_browser_main_win.cc
trunk/src/chrome/browser/chrome_content_browser_client.cc
trunk/src/chrome/browser/chromeos/extensions/file_manager_util.cc
trunk/src/chrome/browser/extensions/extension_error_reporter.cc
trunk/src/chrome/browser/extensions/extensions_startup.cc
trunk/src/chrome/browser/hang_monitor/hung_plugin_action.cc
trunk/src/chrome/browser/importer/importer_host.cc
trunk/src/chrome/browser/pepper_gtalk_message_filter.cc
trunk/src/chrome/browser/printing/print_error_dialog.cc
trunk/src/chrome/browser/process_singleton_win.cc
trunk/src/chrome/browser/ui/cocoa/simple_message_box_mac.mm
trunk/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
trunk/src/chrome/browser/ui/gtk/simple_message_box_gtk.cc
trunk/src/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc
trunk/src/chrome/browser/ui/profile_error_dialog.cc
trunk/src/chrome/browser/ui/simple_message_box.h
trunk/src/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h
trunk/src/chrome/browser/ui/views/simple_message_box_views.cc
trunk/src/chrome/browser/ui/views/simple_message_box_win.cc
trunk/src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
trunk/src/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

Modified: trunk/src/chrome/browser/bookmarks/bookmark_utils.cc
==============================================================================
--- trunk/src/chrome/browser/bookmarks/bookmark_utils.cc (original)
+++ trunk/src/chrome/browser/bookmarks/bookmark_utils.cc Tue Jul 3 18:41:27 2012
@@ -175,11 +175,11 @@
if (child_count < bookmark_utils::num_urls_before_prompting)
return true;

- return browser::ShowMessageBox(parent,
+ return chrome::ShowMessageBox(parent,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
l10n_util::GetStringFUTF16(IDS_BOOKMARK_BAR_SHOULD_OPEN_ALL,
base::IntToString16(child_count)),
- browser::MESSAGE_BOX_TYPE_QUESTION) == browser::MESSAGE_BOX_RESULT_YES;
+ chrome::MESSAGE_BOX_TYPE_QUESTION) == chrome::MESSAGE_BOX_RESULT_YES;
}

// Comparison function that compares based on date modified of the two nodes.
@@ -710,11 +710,11 @@
bool ConfirmDeleteBookmarkNode(const BookmarkNode* node,
gfx::NativeWindow window) {
DCHECK(node && node->is_folder() && !node->empty());
- return browser::ShowMessageBox(window,
+ return chrome::ShowMessageBox(window,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
l10n_util::GetStringFUTF16Int(IDS_BOOKMARK_EDITOR_CONFIRM_DELETE,
ChildURLCountTotal(node)),
- browser::MESSAGE_BOX_TYPE_QUESTION) == browser::MESSAGE_BOX_RESULT_YES;
+ chrome::MESSAGE_BOX_TYPE_QUESTION) == chrome::MESSAGE_BOX_RESULT_YES;
}

void DeleteBookmarkFolders(BookmarkModel* model,

Modified: trunk/src/chrome/browser/chrome_browser_main_win.cc
==============================================================================
--- trunk/src/chrome/browser/chrome_browser_main_win.cc (original)
+++ trunk/src/chrome/browser/chrome_browser_main_win.cc Tue Jul 3 18:41:27 2012
@@ -91,19 +91,18 @@

void WarnAboutMinimumSystemRequirements() {
if (base::win::GetVersion() < base::win::VERSION_XP) {
- const string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
- const string16 message =
- l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP);
- browser::ShowMessageBox(NULL, title, message,
- browser::MESSAGE_BOX_TYPE_WARNING);
+ chrome::ShowMessageBox(NULL,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+ l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP),
+ chrome::MESSAGE_BOX_TYPE_WARNING);
}
}

void ShowCloseBrowserFirstMessageBox() {
- const string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
- const string16 message = l10n_util::GetStringUTF16(IDS_UNINSTALL_CLOSE_APP);
- browser::ShowMessageBox(NULL, title, message,
- browser::MESSAGE_BOX_TYPE_WARNING);
+ chrome::ShowMessageBox(NULL,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+ l10n_util::GetStringUTF16(IDS_UNINSTALL_CLOSE_APP),
+ chrome::MESSAGE_BOX_TYPE_WARNING);
}

int DoUninstallTasks(bool chrome_still_running) {

Modified: trunk/src/chrome/browser/chrome_content_browser_client.cc
==============================================================================
--- trunk/src/chrome/browser/chrome_content_browser_client.cc (original)
+++ trunk/src/chrome/browser/chrome_content_browser_client.cc Tue Jul 3 18:41:27 2012
@@ -407,7 +407,7 @@
content::WebContentsViewDelegate*
ChromeContentBrowserClient::GetWebContentsViewDelegate(
content::WebContents* web_contents) {
- return browser::CreateWebContentsViewDelegate(web_contents);
+ return chrome::CreateWebContentsViewDelegate(web_contents);
}

void ChromeContentBrowserClient::RenderViewHostCreated(

Modified: trunk/src/chrome/browser/chromeos/extensions/file_manager_util.cc
==============================================================================
--- trunk/src/chrome/browser/chromeos/extensions/file_manager_util.cc (original)
+++ trunk/src/chrome/browser/chromeos/extensions/file_manager_util.cc Tue Jul 3 18:41:27 2012
@@ -214,13 +214,13 @@
// TODO: if FindOrCreateTabbedBrowser creates a new browser the returned
// browser is leaked.
Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
- browser::ShowMessageBox(
+ chrome::ShowMessageBox(
browser->window()->GetNativeWindow(),
l10n_util::GetStringFUTF16(
IDS_FILE_BROWSER_ERROR_VIEWING_FILE_TITLE,
UTF8ToUTF16(path.BaseName().value())),
l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ERROR_VIEWING_FILE),
- browser::MESSAGE_BOX_TYPE_WARNING);
+ chrome::MESSAGE_BOX_TYPE_WARNING);
}

// Called when a file on GData was found. Opens the file found at |file_path|

Modified: trunk/src/chrome/browser/extensions/extension_error_reporter.cc
==============================================================================
--- trunk/src/chrome/browser/extensions/extension_error_reporter.cc (original)
+++ trunk/src/chrome/browser/extensions/extension_error_reporter.cc Tue Jul 3 18:41:27 2012
@@ -56,8 +56,8 @@
LOG(ERROR) << "Extension error: " << message;

if (enable_noisy_errors_ && be_noisy) {
- browser::ShowMessageBox(NULL, ASCIIToUTF16("Extension error"), message,
- browser::MESSAGE_BOX_TYPE_WARNING);
+ chrome::ShowMessageBox(NULL, ASCIIToUTF16("Extension error"), message,
+ chrome::MESSAGE_BOX_TYPE_WARNING);
}
}


Modified: trunk/src/chrome/browser/extensions/extensions_startup.cc
==============================================================================
--- trunk/src/chrome/browser/extensions/extensions_startup.cc (original)
+++ trunk/src/chrome/browser/extensions/extensions_startup.cc Tue Jul 3 18:41:27 2012
@@ -18,16 +18,16 @@
const FilePath& crx_path,
const FilePath& output_private_key_path) {
pack_job_succeeded_ = true;
- browser::ShowMessageBox(NULL, ASCIIToUTF16("Extension Packaging Success"),
+ chrome::ShowMessageBox(NULL, ASCIIToUTF16("Extension Packaging Success"),
PackExtensionJob::StandardSuccessMessage(crx_path,
output_private_key_path),
- browser::MESSAGE_BOX_TYPE_INFORMATION);
+ chrome::MESSAGE_BOX_TYPE_INFORMATION);
}

void ExtensionsStartupUtil::OnPackFailure(const std::string& error_message,
ExtensionCreator::ErrorType type) {
- browser::ShowMessageBox(NULL, ASCIIToUTF16("Extension Packaging Error"),
- UTF8ToUTF16(error_message), browser::MESSAGE_BOX_TYPE_WARNING);
+ chrome::ShowMessageBox(NULL, ASCIIToUTF16("Extension Packaging Error"),
+ UTF8ToUTF16(error_message), chrome::MESSAGE_BOX_TYPE_WARNING);
}

bool ExtensionsStartupUtil::PackExtension(const CommandLine& cmd_line) {

Modified: trunk/src/chrome/browser/hang_monitor/hung_plugin_action.cc
==============================================================================
--- trunk/src/chrome/browser/hang_monitor/hung_plugin_action.cc (original)
+++ trunk/src/chrome/browser/hang_monitor/hung_plugin_action.cc Tue Jul 3 18:41:27 2012
@@ -113,9 +113,9 @@
HungWindowResponseCallback,
reinterpret_cast<ULONG_PTR>(this));
current_hung_plugin_window_ = hung_window;
- if (browser::ShowMessageBox(NULL, title, message,
- browser::MESSAGE_BOX_TYPE_QUESTION) ==
- browser::MESSAGE_BOX_RESULT_YES) {
+ if (chrome::ShowMessageBox(NULL, title, message,
+ chrome::MESSAGE_BOX_TYPE_QUESTION) ==
+ chrome::MESSAGE_BOX_RESULT_YES) {
*action = HungWindowNotification::HUNG_WINDOW_TERMINATE_PROCESS;
} else {
// If the user choses to ignore the hung window warning, the

Modified: trunk/src/chrome/browser/importer/importer_host.cc
==============================================================================
--- trunk/src/chrome/browser/importer/importer_host.cc (original)
+++ trunk/src/chrome/browser/importer/importer_host.cc Tue Jul 3 18:41:27 2012
@@ -158,9 +158,9 @@
void ImporterHost::OnGoogleGAIACookieChecked(bool result) {
#if defined(OS_WIN)
if (!result) {
- browser::ShowMessageBox(NULL,
+ chrome::ShowMessageBox(NULL,
l10n_util::GetStringUTF16(IDS_IMPORTER_GOOGLE_LOGIN_TEXT), string16(),
- browser::MESSAGE_BOX_TYPE_INFORMATION);
+ chrome::MESSAGE_BOX_TYPE_INFORMATION);

GURL url("https://accounts.google.com/ServiceLogin");
DCHECK(profile_);

Modified: trunk/src/chrome/browser/pepper_gtalk_message_filter.cc
==============================================================================
--- trunk/src/chrome/browser/pepper_gtalk_message_filter.cc (original)
+++ trunk/src/chrome/browser/pepper_gtalk_message_filter.cc Tue Jul 3 18:41:27 2012
@@ -51,8 +51,8 @@
aura::Window* parent = ash::Shell::GetContainer(
ash::Shell::GetActiveRootWindow(),
ash::internal::kShellWindowId_SystemModalContainer);
- user_response = browser::ShowMessageBox(parent, title, message,
- browser::MESSAGE_BOX_TYPE_QUESTION) == browser::MESSAGE_BOX_RESULT_YES;
+ user_response = chrome::ShowMessageBox(parent, title, message,
+ chrome::MESSAGE_BOX_TYPE_QUESTION) == chrome::MESSAGE_BOX_RESULT_YES;
#else
NOTIMPLEMENTED();
#endif

Modified: trunk/src/chrome/browser/printing/print_error_dialog.cc
==============================================================================
--- trunk/src/chrome/browser/printing/print_error_dialog.cc (original)
+++ trunk/src/chrome/browser/printing/print_error_dialog.cc Tue Jul 3 18:41:27 2012
@@ -11,11 +11,10 @@
namespace chrome {

void ShowPrintErrorDialog(gfx::NativeWindow parent) {
- browser::ShowMessageBox(
- parent,
- l10n_util::GetStringUTF16(IDS_PRINT_SPOOL_FAILED_TITLE_TEXT),
- l10n_util::GetStringUTF16(IDS_PRINT_SPOOL_FAILED_ERROR_TEXT),
- browser::MESSAGE_BOX_TYPE_WARNING);
+ ShowMessageBox(parent,
+ l10n_util::GetStringUTF16(IDS_PRINT_SPOOL_FAILED_TITLE_TEXT),
+ l10n_util::GetStringUTF16(IDS_PRINT_SPOOL_FAILED_ERROR_TEXT),
+ MESSAGE_BOX_TYPE_WARNING);
}

} // namespace chrome

Modified: trunk/src/chrome/browser/process_singleton_win.cc
==============================================================================
--- trunk/src/chrome/browser/process_singleton_win.cc (original)
+++ trunk/src/chrome/browser/process_singleton_win.cc Tue Jul 3 18:41:27 2012
@@ -271,10 +271,10 @@
reinterpret_cast<LPARAM>(&visible_window));

// If there is a visible browser window, ask the user before killing it.
- if (visible_window && browser::ShowMessageBox(NULL,
+ if (visible_window && chrome::ShowMessageBox(NULL,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
l10n_util::GetStringUTF16(IDS_BROWSER_HUNGBROWSER_MESSAGE),
- browser::MESSAGE_BOX_TYPE_QUESTION) == browser::MESSAGE_BOX_RESULT_NO) {
+ chrome::MESSAGE_BOX_TYPE_QUESTION) == chrome::MESSAGE_BOX_RESULT_NO) {
// The user denied. Quit silently.
return PROCESS_NOTIFIED;
}

Modified: trunk/src/chrome/browser/ui/cocoa/simple_message_box_mac.mm
==============================================================================
--- trunk/src/chrome/browser/ui/cocoa/simple_message_box_mac.mm (original)
+++ trunk/src/chrome/browser/ui/cocoa/simple_message_box_mac.mm Tue Jul 3 18:41:27 2012
@@ -10,7 +10,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util_mac.h"

-namespace browser {
+namespace chrome {

MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
const string16& title,
@@ -35,4 +35,4 @@
MESSAGE_BOX_RESULT_NO : MESSAGE_BOX_RESULT_YES;
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
==============================================================================
--- trunk/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm (original)
+++ trunk/src/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm Tue Jul 3 18:41:27 2012
@@ -53,11 +53,11 @@
context_menu_->Init();
}

-namespace browser {
+namespace chrome {

content::WebContentsViewDelegate* CreateWebContentsViewDelegate(
content::WebContents* web_contents) {
return new ChromeWebContentsViewDelegateMac(web_contents);
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/gtk/simple_message_box_gtk.cc
==============================================================================
--- trunk/src/chrome/browser/ui/gtk/simple_message_box_gtk.cc (original)
+++ trunk/src/chrome/browser/ui/gtk/simple_message_box_gtk.cc Tue Jul 3 18:41:27 2012
@@ -41,7 +41,7 @@

} // namespace

-namespace browser {
+namespace chrome {

MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
const string16& title,
@@ -82,4 +82,4 @@
return MESSAGE_BOX_RESULT_YES;
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc
==============================================================================
--- trunk/src/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc (original)
+++ trunk/src/chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc Tue Jul 3 18:41:27 2012
@@ -179,11 +179,11 @@
g_value_unset(&value);
}

-namespace browser {
+namespace chrome {

content::WebContentsViewDelegate* CreateWebContentsViewDelegate(
content::WebContents* web_contents) {
return new ChromeWebContentsViewDelegateGtk(web_contents);
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/profile_error_dialog.cc
==============================================================================
--- trunk/src/chrome/browser/ui/profile_error_dialog.cc (original)
+++ trunk/src/chrome/browser/ui/profile_error_dialog.cc Tue Jul 3 18:41:27 2012
@@ -13,9 +13,9 @@
#if defined(OS_ANDROID)
NOTIMPLEMENTED();
#else
- browser::ShowMessageBox(NULL,
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
- l10n_util::GetStringUTF16(message_id),
- browser::MESSAGE_BOX_TYPE_WARNING);
+ chrome::ShowMessageBox(NULL,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+ l10n_util::GetStringUTF16(message_id),
+ chrome::MESSAGE_BOX_TYPE_WARNING);
#endif
}

Modified: trunk/src/chrome/browser/ui/simple_message_box.h
==============================================================================
--- trunk/src/chrome/browser/ui/simple_message_box.h (original)
+++ trunk/src/chrome/browser/ui/simple_message_box.h Tue Jul 3 18:41:27 2012
@@ -9,7 +9,7 @@
#include "base/string16.h"
#include "ui/gfx/native_widget_types.h"

-namespace browser {
+namespace chrome {

enum MessageBoxResult {
MESSAGE_BOX_RESULT_NO = 0,
@@ -35,6 +35,6 @@
const string16& message,
MessageBoxType type);

-} // namespace browser
+} // namespace chrome

#endif // CHROME_BROWSER_UI_SIMPLE_MESSAGE_BOX_H_

Modified: trunk/src/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h
==============================================================================
--- trunk/src/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h (original)
+++ trunk/src/chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h Tue Jul 3 18:41:27 2012
@@ -8,14 +8,14 @@

namespace content {
class WebContents;
-class WebContentsViewMacDelegate;
+class WebContentsViewDelegate;
}

-namespace browser {
+namespace chrome {

content::WebContentsViewDelegate* CreateWebContentsViewDelegate(
content::WebContents* web_contents);

-} // namespace
+} // namespace chrome

#endif // CHROME_BROWSER_UI_TAB_CONTENTS_CHROME_WEB_CONTENTS_VIEW_DELEGATE_H_

Modified: trunk/src/chrome/browser/ui/views/simple_message_box_views.cc
==============================================================================
--- trunk/src/chrome/browser/ui/views/simple_message_box_views.cc (original)
+++ trunk/src/chrome/browser/ui/views/simple_message_box_views.cc Tue Jul 3 18:41:27 2012
@@ -23,7 +23,7 @@
#include "ui/aura/root_window.h"
#endif

-namespace browser {
+namespace chrome {

namespace {

@@ -187,4 +187,4 @@
return dialog->result();
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/views/simple_message_box_win.cc
==============================================================================
--- trunk/src/chrome/browser/ui/views/simple_message_box_win.cc (original)
+++ trunk/src/chrome/browser/ui/views/simple_message_box_win.cc Tue Jul 3 18:41:27 2012
@@ -6,7 +6,7 @@

#include "ui/base/win/message_box_win.h"

-namespace browser {
+namespace chrome {

MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
const string16& title,
@@ -20,4 +20,4 @@
MESSAGE_BOX_RESULT_NO : MESSAGE_BOX_RESULT_YES;
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
==============================================================================
--- trunk/src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc (original)
+++ trunk/src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc Tue Jul 3 18:41:27 2012
@@ -193,11 +193,11 @@
}
}

-namespace browser {
+namespace chrome {

content::WebContentsViewDelegate* CreateWebContentsViewDelegate(
content::WebContents* web_contents) {
return new ChromeWebContentsViewDelegateViews(web_contents);
}

-} // namespace browser
+} // namespace chrome

Modified: trunk/src/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
==============================================================================
--- trunk/src/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc (original)
+++ trunk/src/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc Tue Jul 3 18:41:27 2012
@@ -143,10 +143,10 @@
return;
}

- *out_close_dialog = browser::ShowMessageBox(dialog_window_,
+ *out_close_dialog = chrome::ShowMessageBox(dialog_window_,
l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE),
l10n_util::GetStringUTF16(IDS_MOBILE_CANCEL_ACTIVATION),
- browser::MESSAGE_BOX_TYPE_QUESTION);
+ chrome::MESSAGE_BOX_TYPE_QUESTION);
}

bool MobileSetupDialogDelegate::ShouldShowDialogTitle() const {