Merge 64807 & 64824 - Cloud Print Dialog work

chrome/browser/views/html_dialog_view.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_
 #define CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 37 matching lines @@
   virtual gfx::Size GetPreferredSize();
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
 
   // Overridden from views::WindowDelegate:
   virtual bool CanResize() const;
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual void WindowClosing();
   virtual views::View* GetContentsView();
   virtual views::View* GetInitiallyFocusedView();
+  virtual bool ShouldShowWindowTitle() const;
 
   // Overridden from HtmlDialogUIDelegate:
   virtual bool IsDialogModal() const;
   virtual std::wstring GetDialogTitle() const;
   virtual GURL GetDialogContentURL() const;
   virtual void GetDOMMessageHandlers(
       std::vector<DOMMessageHandler*>* handlers) const;
   virtual void GetDialogSize(gfx::Size* size) const;
   virtual std::string GetDialogArgs() const;
   virtual void OnDialogClosed(const std::string& json_retval);
   virtual void OnCloseContents(TabContents* source, bool* out_close_dialog);
+  virtual bool ShouldShowDialogTitle() const;
 
   // Overridden from TabContentsDelegate:
   virtual void MoveContents(TabContents* source, const gfx::Rect& pos);
   virtual void ToolbarSizeChanged(TabContents* source, bool is_animating);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void CloseContents(TabContents* source);
 
  private:
   // This view is a delegate to the HTML content since it needs to get notified
   // about when the dialog is closing. For all other actions (besides dialog
   // closing) we delegate to the creator of this view, which we keep track of
   // using this variable.
   HtmlDialogUIDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(HtmlDialogView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_