[Md Feedback] Add initial data population for dialog.

chrome/browser/feedback/feedback_dialog_utils.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 <string>
+#include "chrome/browser/feedback/feedback_dialog_utils.h"
 
-#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/md_feedback/md_feedback_dialog_controller.h"
-#include "chrome/common/chrome_switches.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
-namespace {
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "components/signin/core/account_id/account_id.h"
+#endif
+
+namespace chrome {
 
 GURL GetTargetTabUrl(int session_id, int index) {
   Browser* browser = chrome::FindBrowserWithID(session_id);
   // Sanity checks.
   if (!browser || index >= browser->tab_strip_model()->count())
     return GURL();
 
   if (index >= 0) {
     content::WebContents* target_tab =
         browser->tab_strip_model()->GetWebContentsAt(index);
     if (target_tab)
       return target_tab->GetURL();
   }
 
   return GURL();
 }
 
-}  // namespace
-
-namespace chrome {
-
-void ShowFeedbackPage(Browser* browser,
-                      const std::string& description_template,
-                      const std::string& category_tag) {
-  GURL page_url;
-  if (browser) {
-    page_url = GetTargetTabUrl(browser->session_id().id(),
-                               browser->tab_strip_model()->active_index());
-  }
-
+Profile* GetFeedbackProfile(Browser* browser) {
   Profile* profile = NULL;

[afakhry, 2016/09/14 01:48:15]

nullptr.

[apacible, 2016/09/14 17:53:19]

Done.

   if (browser) {

[afakhry, 2016/09/14 01:48:15]

Nit: please remove curly braces from single-line if/else.

Actually, it would be better to use a ternary operator here. :)

[apacible, 2016/09/14 17:53:19]

Done.

     profile = browser->profile();
   } else {
     profile = ProfileManager::GetLastUsedProfileAllowedByPolicy();
   }
-  if (!profile) {
-    LOG(ERROR) << "Cannot invoke feedback: No profile found!";
-    return;
-  }
+  if (!profile)
+    return NULL;

[afakhry, 2016/09/14 01:48:15]

nullptr.

[apacible, 2016/09/14 17:53:20]

Done.

 
   // We do not want to launch on an OTR profile.
   profile = profile->GetOriginalProfile();
   DCHECK(profile);
 
 #if defined(OS_CHROMEOS)
   // Obtains the display profile ID on which the Feedback window should show.
   chrome::MultiUserWindowManager* const window_manager =
       chrome::MultiUserWindowManager::GetInstance();
   const AccountId display_account_id =
       window_manager && browser
           ? window_manager->GetUserPresentingWindow(
                 browser->window()->GetNativeWindow())
           : EmptyAccountId();
   profile = display_account_id.is_valid()
                 ? multi_user_util::GetProfileFromAccountId(display_account_id)
                 : profile;

[afakhry, 2016/09/14 01:48:15]

This, however, is more suitable for an if(), since profile should retain its
original value if the condition is not satisfied. So:

if (display_account_id.is_valid())
  profile = multi_user_util::GetProfileFromAccountId(display_account_id);

[apacible, 2016/09/14 17:53:20]

Done.

 #endif
-
-  if (::switches::MdFeedbackEnabled()) {
-    MdFeedbackDialogController::GetInstance()->Show(profile);
-    return;
-  }
-
-  extensions::FeedbackPrivateAPI* api =
-      extensions::FeedbackPrivateAPI::GetFactoryInstance()->Get(profile);
-
-  api->RequestFeedback(description_template,
-                       category_tag,
-                       page_url);
+  return profile;
 }
 
 }  // namespace chrome