Cleanup: Break another common->app dependency.

chrome/browser/views/bug_report_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bug_report_view.h"
 
+#include <string>
+#include <vector>
+
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/waitable_event.h"
-#include "chrome/app/chrome_version_info.h"
 #include "chrome/browser/bug_report_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
@@ skipping 148 matching lines @@
   task_waitable.Wait();
   if (*image_str == "")
     return false;
   else
     return true;
 #else
   return false;
 #endif
 }
 
-} // namespace
+}  // namespace
 
 namespace browser {
 
 // Global "display this dialog" function declared in browser_dialogs.h.
 void ShowBugReportView(views::Window* parent,
                        Profile* profile,
                        TabContents* tab) {
   BugReportView* view = new BugReportView(profile, tab);
 
   // Get the size of the parent window to capture screenshot dimensions
@@ skipping 64 matching lines @@
     user_email_text_->SetText(UTF8ToUTF16(std::string("")));
   } else {
     const std::string& email = manager->logged_in_user().email();
     user_email_text_->SetText(UTF8ToUTF16(email));
     if (!email.empty())
       user_email_text_->SetEnabled(false);
   }
 #endif
 
   // Retrieve the application version info.
-  scoped_ptr<FileVersionInfo> version_info(
-      chrome_app::GetChromeVersionInfo());
+  scoped_ptr<FileVersionInfo> version_info(chrome::GetChromeVersionInfo());
   if (version_info.get()) {
     version_ = version_info->product_name() + L" - " +
         version_info->file_version() +
         L" (" + version_info->last_change() + L")";
   }
 
 
   FilePath tmpfilename;
 
 #if defined(OS_CHROMEOS)
@@ skipping 157 matching lines @@
 }
 
 gfx::Size BugReportView::GetPreferredSize() {
   gfx::Size size = views::Window::GetLocalizedContentsSize(
       IDS_BUGREPORT_DIALOG_WIDTH_CHARS,
 #if defined(OS_CHROMEOS)
       IDS_CHROMEOS_BUGREPORT_DIALOG_HEIGHT_LINES);
 #else
       IDS_BUGREPORT_DIALOG_HEIGHT_LINES);
 #endif
- return size;
+  return size;
 }
 
 void BugReportView::UpdateReportingControls(bool is_phishing_report) {
   // page source, screen/page images, system information
   // are not needed if it's a phishing report
 
   include_page_source_checkbox_->SetEnabled(!is_phishing_report);
   include_page_source_checkbox_->SetChecked(!is_phishing_report);
 
 #if defined(OS_CHROMEOS)
@@ skipping 147 matching lines @@
   Browser* browser = BrowserList::GetLastActive();
   if (browser)
     browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
 }
 #endif
 
 
 views::View* BugReportView::GetContentsView() {
   return this;
 }