← Back to branch summary

~abreu-alexandre/oxide/add-ua-to-downloadrequested

« back to all changes in this revision

Viewing changes to shared/browser/oxide_web_view.cc

https://launchpad.net/bugs/1435418
Clean up the interfaces in qt/core/glue. Hopefully this will make it more obvious where to place new code (ie, only interfaces in qt/core/glue now)

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_web_view.cc
811
811
void WebView::RunFileChooser(content::WebContents* source,
812
812
                             const content::FileChooserParams& params) {
813
813
  DCHECK_VALID_SOURCE_CONTENTS
814
 
  DCHECK(!active_file_picker_);
815
814
 
816
815
  content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
817
816
  FilePicker* file_picker = CreateFilePicker(rvh);
821
820
    return;
822
821
  }
823
822
 
824
 
  active_file_picker_ = file_picker->AsWeakPtr();
825
 
  active_file_picker_->Run(params);
 
823
  file_picker->Run(params);
826
824
}
827
825
 
828
826
void WebView::EnterFullscreenModeForTab(content::WebContents* source,
896
894
  WebFrame* frame = WebFrame::FromRenderFrameHost(new_host);
897
895
 
898
896
  if (frame) {
899
 
    frame->set_render_frame_host(new_host);
 
897
    frame->SetRenderFrameHost(new_host);
900
898
    return;
901
899
  }
902
900
 
1148
1146
  return true;
1149
1147
}
1150
1148
 
1151
 
WebFrame* WebView::CreateWebFrame(content::RenderFrameHost* rfh) {
1152
 
  return new WebFrame(rfh, this);
 
1149
WebFrame* WebView::CreateWebFrame(
 
1150
    content::RenderFrameHost* render_frame_host) {
 
1151
  return new WebFrame(render_frame_host, this);
1153
1152
}
1154
1153
 
1155
1154
WebPopupMenu* WebView::CreatePopupMenu(content::RenderFrameHost* rfh) {
1890
1889
                            int selected_item,
1891
1890
                            const std::vector<content::MenuItem>& items,
1892
1891
                            bool allow_multiple_selection) {
1893
 
  DCHECK(!active_popup_menu_ || active_popup_menu_->WasHidden());
 
1892
  DCHECK(!active_popup_menu_);
1894
1893
 
1895
1894
  WebPopupMenu* menu = CreatePopupMenu(render_frame_host);
1896
1895
  if (!menu) {
1899
1898
    return;
1900
1899
  }
1901
1900
 
1902
 
  active_popup_menu_ = menu->AsWeakPtr();
 
1901
  active_popup_menu_ = menu->GetWeakPtr();
1903
1902
 
1904
1903
  menu->Show(bounds, items, selected_item, allow_multiple_selection);
1905
1904
}
1906
1905
 
1907
1906
void WebView::HidePopupMenu() {
1908
 
  if (active_popup_menu_ && !active_popup_menu_->WasHidden()) {
1909
 
    active_popup_menu_->Hide();
 
1907
  if (!active_popup_menu_) {
 
1908
    return;
1910
1909
  }
 
1910
 
 
1911
  active_popup_menu_->Close();
1911
1912
}
1912
1913
 
1913
1914
void WebView::RequestGeolocationPermission(
2090
2091
}
2091
2092
 
2092
2093
JavaScriptDialog* WebView::CreateJavaScriptDialog(
2093
 
    content::JavaScriptMessageType javascript_message_type,
2094
 
    bool* did_suppress_message) {
 
2094
    content::JavaScriptMessageType javascript_message_type) {
2095
2095
  return nullptr;
2096
2096
}
2097
2097